diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-08-06 09:22:43 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-08-06 09:22:43 -0700 |
| commit | 81c342dfa9ac04378e22c76f119408e6e00c0f13 (patch) | |
| tree | 728de42a95d436d7a753bf3884d683d4201b5ad0 /indra/newview/pipeline.cpp | |
| parent | 3b2f456416d29534cb41fc9d4ad3bf195dcfc847 (diff) | |
| parent | 1346949e4d601e8c945fa30593ba1d405e9ed80d (diff) | |
Merge with 3.7.13-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"); |