summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorcallum@lindenlab.com <callum@lindenlab.com>2017-02-03 10:03:02 -0800
committercallum@lindenlab.com <callum@lindenlab.com>2017-02-03 10:03:02 -0800
commitc703b2c038c369807218f61b7e90e7134da390f5 (patch)
tree2123b41de557e0526b5841f8a512408fc8eeb7d9 /indra/newview
parentfed164732bbd69b22fc0219133bf4cef3deb5f2b (diff)
parentf0a79147210c4ef402dce10a0a3c796807298033 (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;