summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-02-19 07:34:35 -0500
committerOz Linden <oz@lindenlab.com>2011-02-19 07:34:35 -0500
commit19e99a5c09274049d00f25b2d88ee6429747b084 (patch)
treedd0bce45605b1f740dfe210738dda98dc87e7455 /indra/newview/llappviewer.cpp
parent1a79aeca54db6ee5bf1fb2968c2642f8a3306091 (diff)
parent634f152004f4b3938239ec2494030079f695b8ab (diff)
Automated merge with file:///Users/oz/Work/V-D
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index a23f809b71..8ce11ef599 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -458,6 +458,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