summaryrefslogtreecommitdiff
path: root/indra/newview/llviewercontrol.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2014-02-28 13:35:03 -0600
committerDave Parks <davep@lindenlab.com>2014-02-28 13:35:03 -0600
commit6abbe4cf55c2e4a6a879b00971bc5d70a7c58e8a (patch)
tree6e3f07a52f3fe26b6ec91222f53b365b12c0c58d /indra/newview/llviewercontrol.cpp
parentd9d2659e11991ba41a052e011c610a213872d705 (diff)
parent7835d48f6d6f26e37a8ff4528dc5c2faf4b8ebf7 (diff)
Automated merge with https://bitbucket.org/lindenlab/viewer-lion
Diffstat (limited to 'indra/newview/llviewercontrol.cpp')
-rwxr-xr-xindra/newview/llviewercontrol.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 744ec4de2b..002a337e04 100755
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -368,6 +368,7 @@ static bool handleRepartition(const LLSD&)
if (gPipeline.isInit())
{
gOctreeMaxCapacity = gSavedSettings.getU32("OctreeMaxNodeCapacity");
+ gOctreeMinSize = gSavedSettings.getF32("OctreeMinimumNodeSize");
gObjectList.repartitionObjects();
}
return true;