diff options
author | Loren Shih <seraph@lindenlab.com> | 2011-04-04 10:42:52 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2011-04-04 10:42:52 -0400 |
commit | 47781184fc50f6e9e0842c2d7fa7632038a279df (patch) | |
tree | 83522faadf17895565c38d89064aff6da51a1006 /indra/newview/llappviewer.cpp | |
parent | 0dd0758ab9114c53a274ff707d626c8fe5e7afb0 (diff) | |
parent | 3c6a09372da395a621fb35db4934af2c7c21e910 (diff) |
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rwxr-xr-x | indra/newview/llappviewer.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 1184c8e76c..643c611b30 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -500,6 +500,7 @@ static void settings_to_globals() LLVolumeImplFlexible::sUpdateFactor = gSavedSettings.getF32("RenderFlexTimeFactor"); LLVOTree::sTreeFactor = gSavedSettings.getF32("RenderTreeLODFactor"); LLVOAvatar::sLODFactor = gSavedSettings.getF32("RenderAvatarLODFactor"); + LLVOAvatar::sPhysicsLODFactor = gSavedSettings.getF32("RenderAvatarPhysicsLODFactor"); LLVOAvatar::sMaxVisible = (U32)gSavedSettings.getS32("RenderAvatarMaxVisible"); LLVOAvatar::sVisibleInFirstPerson = gSavedSettings.getBOOL("FirstPersonAvatarVisible"); // clamp auto-open time to some minimum usable value |