diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-04 19:09:49 -0400 | 
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-04 19:09:49 -0400 | 
| commit | 30cd9f7d475f67a65490774ab6d5a932c380494c (patch) | |
| tree | 52a1e9e91253e401a049cfc485af10d1d14fffb4 /indra/newview | |
| parent | 1aee76cf57de2a206bfa464257b1af44acc3fc9c (diff) | |
| parent | 032e5d30c07b77402c9f38365a5b2d424ae25271 (diff) | |
merge changes for storm-1141
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llspatialpartition.cpp | 2 | 
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);  | 
