Compile fix, need to use integer GL uniform.
got rid of some dead code
Merge branch 'master' of https://github.com/worklist/hifi
added some tree methods for primitive voxel editing
change to encodeTreeBitstreamRecursion() to allow calling without viewFrustum
Merge branch 'master' of https://github.com/worklist/hifi
Fixed bug with rendering stars on OS X: was using some weird extension on
Apple rather than standard VBOs.
Removed my temporary fix for pairing server bits.
Added newline at end of file; just trying to get this file out of the diff.
OK, I give up.
Merge pull request #194 from ey6es/master

Fix for starfield rendering on OS X.
added read/write voxel files
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
fixed acidental local mode
added save/load persistant file on server startup
added voxel-edit tool, as well as made voxel file read/write work, disabled voxel persist on server shutdown
added --wantVoxelPersist command line to server
fixed local domain
adding command options
added TREE_SCALE to default camera farClip