Avoid perpetual re-entry for LLOctreeNode::octree_pool_alloc::malloc if LL_USE_TCMALLOC is defined.
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
Merge branch 'master' into slb
Feature Request: Add MiniMapPrimMaxAltitudeDelta and MiniMapPrimMaxAltitudeDeltaOwn to debug settings for users to configure how much altitude difference prims can have to be shown on the minimap