diff options
author | callum@lindenlab.com <callum@lindenlab.com> | 2017-02-13 12:28:47 -0800 |
---|---|---|
committer | callum@lindenlab.com <callum@lindenlab.com> | 2017-02-13 12:28:47 -0800 |
commit | 13ec15beb948f0036ea281a5bee25355b5d5478b (patch) | |
tree | b6aa41aca034f1ffb65c619a0da843f8d9d46163 /indra/newview/llspatialpartition.cpp | |
parent | 8d884c343669d884c2f9eb7485a77fdf9a83ce5d (diff) | |
parent | c703b2c038c369807218f61b7e90e7134da390f5 (diff) |
Automated merge with head of callum_linden/viewer64-callum
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
-rw-r--r-- | indra/newview/llspatialpartition.cpp | 3 |
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; |