summaryrefslogtreecommitdiff
path: root/indra/newview/llspatialpartition.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2014-02-27 18:06:48 -0600
committerDave Parks <davep@lindenlab.com>2014-02-27 18:06:48 -0600
commit7835d48f6d6f26e37a8ff4528dc5c2faf4b8ebf7 (patch)
tree891c61ee0be7c2209f08ec99697564b60d9122f4 /indra/newview/llspatialpartition.cpp
parent7ad70e0f245726c98bff382539a60d591ea67aba (diff)
parenta8e22e11c5d26b3cdfa2d67919fdde8272d52ea4 (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;