diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-07-21 14:48:30 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-07-21 14:48:30 -0400 |
| commit | df3e6b40fd80a139e745106231bc5c752271beea (patch) | |
| tree | c52227a2428060c5f3ffd7a1f97725c45adedb3a /indra/newview/pipeline.cpp | |
| parent | 8192a3c5b2addd63e1d5c12269eec7e6de2adde0 (diff) | |
| parent | 532433674c9553636af9ea8d433b9da6d6fae587 (diff) | |
merge changes for 3.7.12-release
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rwxr-xr-x | indra/newview/pipeline.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 7d7b32f305..3dfe1e5992 100755 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -492,6 +492,7 @@ void LLPipeline::init() refreshCachedSettings(); gOctreeMaxCapacity = gSavedSettings.getU32("OctreeMaxNodeCapacity"); + gOctreeMinSize = gSavedSettings.getF32("OctreeMinimumNodeSize"); sDynamicLOD = gSavedSettings.getBOOL("RenderDynamicLOD"); sRenderBump = gSavedSettings.getBOOL("RenderObjectBump"); sUseTriStrips = gSavedSettings.getBOOL("RenderUseTriStrips"); |