summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorbrad kittenbrink <brad@lindenlab.com>2011-05-03 17:52:52 -0700
committerbrad kittenbrink <brad@lindenlab.com>2011-05-03 17:52:52 -0700
commit032e5d30c07b77402c9f38365a5b2d424ae25271 (patch)
treeb21cfae1240d222f1cf82c9154e7bbdcf5fe57e5 /indra/newview
parentb9bb792c478d703c6442351ecb563c0a67f77111 (diff)
parent0d5a0cefd4d5b34d3c8e9d06621ec3e1f4e5d46b (diff)
Merge.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llspatialpartition.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index 8adb8c30e0..94784f3f49 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -1635,8 +1635,6 @@ LLSpatialPartition::LLSpatialPartition(U32 data_mask, BOOL render_by_group, U32
mSlopRatio = 0.25f;
mInfiniteFarClip = FALSE;
- LLGLNamePool::registerPool(&sQueryPool);
-
mOctree = new LLSpatialGroup::OctreeRoot(LLVector3d(0,0,0),
LLVector3d(1,1,1),
NULL);