summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorCallum Linden <callum@lindenlab.com>2017-01-30 13:56:38 -0800
committerCallum Linden <callum@lindenlab.com>2017-01-30 13:56:38 -0800
commitdf4957e3984ddf3f0183229175709e55f6b7880d (patch)
treead39f933e9461ce00c1451daeaf6a3842cfa64ff /indra/newview
parentdcae92c0a306aaf6447089b340913d4a678855ac (diff)
parent189d56fa3eae36daf99555325599649a547832c9 (diff)
Automated merge with head of lindenlab/nat_viewer64
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llspatialpartition.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index 0fd36766b3..94b838e829 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -61,9 +61,6 @@ extern bool gShiftFrame;
static U32 sZombieGroups = 0;
U32 LLSpatialGroup::sNodeCount = 0;
-U32 gOctreeMaxCapacity;
-F32 gOctreeMinSize;
-
BOOL LLSpatialGroup::sNoDelete = FALSE;
static F32 sLastMaxTexPriority = 1.f;