diff options
author | Kent Quirk <q@lindenlab.com> | 2010-06-17 11:37:21 -0400 |
---|---|---|
committer | Kent Quirk <q@lindenlab.com> | 2010-06-17 11:37:21 -0400 |
commit | 4bf8a0c7fca329ce1d0c58bc3ebf86fbbe544d40 (patch) | |
tree | 11c6e9bdeee80d486445ea301e97742c00cdff7a /indra/newview/llappviewer.cpp | |
parent | 59cc637b8df9b189b2c43e2fcf588c977580f820 (diff) | |
parent | 7cc006347822a70f36175dc2627814a0eaeb9c0a (diff) |
Merge (and resolve conflict) from q/viewer-release
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index ca411d4f07..fc6272f1fc 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -412,7 +412,7 @@ static void settings_to_globals() LLVolumeImplFlexible::sUpdateFactor = gSavedSettings.getF32("RenderFlexTimeFactor"); LLVOTree::sTreeFactor = gSavedSettings.getF32("RenderTreeLODFactor"); LLVOAvatar::sLODFactor = gSavedSettings.getF32("RenderAvatarLODFactor"); - LLVOAvatar::sMaxVisible = gSavedSettings.getS32("RenderAvatarMaxVisible"); + LLVOAvatar::sMaxVisible = (U32)gSavedSettings.getS32("RenderAvatarMaxVisible"); LLVOAvatar::sVisibleInFirstPerson = gSavedSettings.getBOOL("FirstPersonAvatarVisible"); // clamp auto-open time to some minimum usable value LLFolderView::sAutoOpenTime = llmax(0.25f, gSavedSettings.getF32("FolderAutoOpenDelay")); |