diff options
author | Oz Linden <oz@lindenlab.com> | 2018-01-19 11:18:29 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2018-01-19 11:18:29 -0500 |
commit | a7911c43791a76f0f93f920f527970125afdc730 (patch) | |
tree | 99228045170856cf7721e83274bc9d74b45f42a4 /indra/newview/llspatialpartition.cpp | |
parent | 444643aeb0b80fdfbe28e0e2faae56de9d4f6e4a (diff) | |
parent | 7acbd8ed8d73c507675d45360df07d232c431a8b (diff) |
merge changes for 5.1.0-release
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 df5756cf11..d2a87ee2af 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; |