diff options
| author | Dave Parks <davep@lindenlab.com> | 2014-02-27 18:06:48 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2014-02-27 18:06:48 -0600 |
| commit | 7835d48f6d6f26e37a8ff4528dc5c2faf4b8ebf7 (patch) | |
| tree | 891c61ee0be7c2209f08ec99697564b60d9122f4 /indra/newview/pipeline.cpp | |
| parent | 7ad70e0f245726c98bff382539a60d591ea67aba (diff) | |
| parent | a8e22e11c5d26b3cdfa2d67919fdde8272d52ea4 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-lion
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 5da8a78b1b..ab6e5cc353 100755 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -498,6 +498,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"); |