summaryrefslogtreecommitdiff
path: root/indra/newview/llspatialpartition.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2014-03-11 17:42:02 -0500
committerDave Parks <davep@lindenlab.com>2014-03-11 17:42:02 -0500
commit02423199e89473c6aad2c6ab121d44c1f238dbd1 (patch)
tree4bb804729c65a892919ac5ae10a208c4dc0a9b1b /indra/newview/llspatialpartition.cpp
parentcf2a180823e4e6daa0649ab54a5f7ed6ba14dbb2 (diff)
parent6abbe4cf55c2e4a6a879b00971bc5d70a7c58e8a (diff)
Automated merge with https://bitbucket.org/lindenlab/viewer-lion
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
-rwxr-xr-xindra/newview/llspatialpartition.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index 2c83f6d0b7..69ba51b10a 100755
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -78,6 +78,7 @@ U32 LLSpatialGroup::sNodeCount = 0;
std::set<GLuint> LLSpatialGroup::sPendingQueries;
U32 gOctreeMaxCapacity;
+F32 gOctreeMinSize;
BOOL LLSpatialGroup::sNoDelete = FALSE;