livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes for FIRE-22130 - re-baselining RenderolumeLODFactor advice and warnings. 

updates phototools to limit range to < 8 as values much above that can cause errors
updates warning to appear above 4 not at 4
updates the language used in warnings/tool_tips etc across the viewer
master
Beq 2018-01-07 23:26:10 +00:00
parent 4f400bad6d
commit d6b1eadf2d
8 changed files with 40 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/app_settings/settings.xml
View File

@ -13022,13 +13022,13 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>RenderVolumeLODFactor</key>
<map>
<key>Comment</key>
<string>Controls level of detail of primitives (multiplier for current screen area when calculated level of detail)</string>
<string>Influences the distance at which the viewer will display a lower detail model. Higher values = more lag. IMPORTANT: Please disregard advice to increase this value, such as is commonly distributed in notecards.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>1.0</real>
<real>2.0</real>
<key>SanityCheckType</key>
<string>LessThanEquals</string>
<key>SanityValue</key>

14
indra/newview/llstartup.cpp
View File

@ -3039,12 +3039,18 @@ void login_show()
FSPanelLogin::show( gViewerWindow->getWindowRectScaled(), login_callback, NULL );
// </FS:Ansariel> [FS Login Panel]
// <FS:PP> Warning about too high LOD on startup
if (gSavedSettings.getF32("RenderVolumeLODFactor") >= 4.0f)
// <FS:Beq> [FIRE-22130] for LOD Factors > 4 reset to the detected dafault
F32 old_val = gSavedSettings.getF32("RenderVolumeLODFactor");
if (old_val > 4.0f)
{
LLNotificationsUtil::add("RenderVolumeLODFactorWarning");
U32 gfx_level = gSavedSettings.getU32("RenderQualityPerformance");
F32 new_val = 2.0; //majority
if (gfx_level == 0) new_val = 1.125; // low = 0
if (gfx_level > 5) new_val = 3.0; // ultra = 6
gSavedSettings.setF32("RenderVolumeLODFactor", new_val);
LL_INFOS("AppInit") << "LOD Factor reset to sane value. Was " << old_val << " now " << gSavedSettings.getF32("RenderVolumeLODFactor") << LL_ENDL;
}
// </FS:PP>
// </FS:Beq>
}

2
indra/newview/llviewercontrol.cpp
View File

@ -286,7 +286,7 @@ static bool handleVolumeLODChanged(const LLSD& newvalue)
LLVOVolume::sDistanceFactor = 1.f-LLVOVolume::sLODFactor * 0.1f;
// <FS:PP> Warning about too high LOD on LOD change
if (LLVOVolume::sLODFactor >= 4.0f)
if (LLVOVolume::sLODFactor > 4.0f)
{
LLNotificationsUtil::add("RenderVolumeLODFactorWarning");
}

12
indra/newview/skins/default/xui/en/floater_phototools.xml
View File

@ -2676,7 +2676,7 @@
layout="topleft"
left="5"
top_pad="5"
tool_tip="Controls the detail of prims. Higher values produce greater detail for objects."
tool_tip="Controls when lower-detail objects can be used to reduce rendering cost. Higher values cause lag, use with care."
width="80">
Obj. Detail
</text>
@ -2685,11 +2685,11 @@
control_name="RenderVolumeLODFactor"
follows="left|top"
height="16"
increment="1"
increment="0.125"
layout="topleft"
left_pad="-20"
min_val="0"
max_val="15"
max_val="8.0"
top_delta="-2"
width="127"/>
<spinner
@ -2698,12 +2698,12 @@
top_delta="-3"
label_width="0"
left_pad="3"
decimal_digits="0"
decimal_digits="3"
follows="left|top"
max_val="15"
max_val="8.0"
min_val="0"
width="53"
increment="1"/>
increment="0.125"/>
<button
follows="left|top"
name="Reset_Object_Detail"

14
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -13195,14 +13195,16 @@ Due to server load, mass toggling online status visibility can take a while to b
icon="alert.tga"
name="RenderVolumeLODFactorWarning"
type="alert">
WARNING: The Level of Detail (LOD) seems to be set to a high value.
WARNING: The Level of Detail (LOD) Factor is set high
Values higher than 8 are meaningless and give no improvement. You should not set this to a value higher than 4, and only in exceptional situations (like taking high-resolution photos). Setting this too high seriously lowers your graphics performance.
For everyday use, LOD set to 2 should suffice. If you own some objects that look deformed with such value, then you should consider replacing them.
For everyday use, LOD Factor in the range of 1-3 suffices.
Consider replacing objects that look deformed at such values.
LOD Factor >3: Adds to lag. Advised only for photography.
LOD Factor >4: Use in special circumstances. Reverts after relog.
LOD Factor >8: Has no real effect. May cause errors.
<usetemplate
ignoretext="Warn about high Level of Detail"
name="okignore"
name="okbutton"
yestext="OK"/>
</notification>
<notification

1
indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
View File

@ -665,6 +665,7 @@
<slider
control_name="RenderVolumeLODFactor"
tool_tip="Controls when lower-detail objects can be used to reduce rendering cost. Higher values cause lag, use with care."
follows="left|top"
height="15"
increment="0.125"

12
indra/newview/skins/starlight/xui/en/floater_phototools.xml
View File

@ -2743,7 +2743,7 @@
layout="topleft"
left="5"
top_pad="5"
tool_tip="Controls the detail of prims. Higher values produce greater detail for objects."
tool_tip="Controls when lower-detail objects can be used to reduce rendering cost. Higher values cause lag, use with care."
width="80">
Obj. Detail
</text>
@ -2752,11 +2752,11 @@
control_name="RenderVolumeLODFactor"
follows="left|top"
height="16"
increment="1"
increment="0.125"
layout="topleft"
left_pad="-20"
min_val="0"
max_val="15"
max_val="8.0"
top_delta="-2"
width="127"/>
<spinner
@ -2765,12 +2765,12 @@
top_delta="-3"
label_width="0"
left_pad="3"
decimal_digits="0"
decimal_digits="3"
follows="left|top"
max_val="15"
max_val="8.0"
min_val="0"
width="53"
increment="1"/>
increment="0.125"/>
<button
follows="left|top"
name="Reset_Object_Detail"

12
indra/newview/skins/starlightcui/xui/en/floater_phototools.xml
View File

@ -2743,8 +2743,8 @@
layout="topleft"
left="5"
top_pad="5"
tool_tip="Controls the detail of prims. Higher values produce greater detail for objects."
width="80">
tool_tip="Controls when lower-detail objects can be used to reduce rendering cost. Higher values cause lag, use with care."
width="80">
Obj. Detail
</text>
<slider_bar
@ -2752,11 +2752,11 @@
control_name="RenderVolumeLODFactor"
follows="left|top"
height="16"
increment="1"
increment="0.125"
layout="topleft"
left_pad="-20"
min_val="0"
max_val="15"
max_val="8.0"
top_delta="-2"
width="127"/>
<spinner
@ -2767,10 +2767,10 @@
left_pad="3"
decimal_digits="0"
follows="left|top"
max_val="15"
max_val="8.0"
min_val="0"
width="53"
increment="1"/>
increment="0.125"/>
<button
follows="left|top"
name="Reset_Object_Detail"