fixed invalid define guard
editVoxels - importing voxels
Merge branch 'master' of https://github.com/worklist/hifi into editVoxels
code style
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels
More work on editVoxel.js
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels
improve octree stats display
make domain server less noisy about Agent assignments
fix unix compiler issue
more noise suppression
more noise suppression
tweak names
Added preview deplacement + fixed locking issue
Fixed spaces added everywhere
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels
some hacking on full scene debuggin