summaryrefslogtreecommitdiff
path: root/indra/newview/llspatialpartition.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2017-02-03 20:14:32 -0500
committerNat Goodspeed <nat@lindenlab.com>2017-02-03 20:14:32 -0500
commit37974a2fa26ecdd1bbe91e3007ad4cf81af1f851 (patch)
tree71eb6db2ddfcc28719f7fc5a920068f886b079c2 /indra/newview/llspatialpartition.cpp
parentc2c4a1e8514dc8a0df8e9d2f7b2e743691ef7ce3 (diff)
parent275d2e7e025eb7b3bfd8d924429e4bf9dbb26e66 (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
-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;