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

Sun, 07 Jan 2018 23:26:10 +0000

author
Beq <beqjanus@gmail.com>
date
Sun, 07 Jan 2018 23:26:10 +0000
branch
Firestorm_5.0.11
changeset 53589
bd3223565b7a
parent 53588
20ec98047524
child 53590
6b42b6106786

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

indra/newview/app_settings/settings.xml file | annotate | diff | revisions
indra/newview/llstartup.cpp file | annotate | diff | revisions
indra/newview/llviewercontrol.cpp file | annotate | diff | revisions
indra/newview/skins/default/xui/en/floater_phototools.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/en/notifications.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml file | annotate | diff | revisions
indra/newview/skins/starlight/xui/en/floater_phototools.xml file | annotate | diff | revisions
indra/newview/skins/starlightcui/xui/en/floater_phototools.xml file | annotate | diff | revisions
     1.1 --- a/indra/newview/app_settings/settings.xml	Fri Jan 05 13:55:36 2018 +0100
     1.2 +++ b/indra/newview/app_settings/settings.xml	Sun Jan 07 23:26:10 2018 +0000
     1.3 @@ -13022,13 +13022,13 @@
     1.4  	<key>RenderVolumeLODFactor</key>
     1.5      <map>
     1.6        <key>Comment</key>
     1.7 -      <string>Controls level of detail of primitives (multiplier for current screen area when calculated level of detail)</string>
     1.8 -      <key>Persist</key>
     1.9 -      <integer>1</integer>
    1.10 -      <key>Type</key>
    1.11 -      <string>F32</string>
    1.12 -      <key>Value</key>
    1.13 -      <real>1.0</real>
    1.14 +      <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>
    1.15 +      <key>Persist</key>
    1.16 +      <integer>1</integer>
    1.17 +      <key>Type</key>
    1.18 +      <string>F32</string>
    1.19 +      <key>Value</key>
    1.20 +      <real>2.0</real>
    1.21        <key>SanityCheckType</key>
    1.22        <string>LessThanEquals</string>
    1.23        <key>SanityValue</key>
     2.1 --- a/indra/newview/llstartup.cpp	Fri Jan 05 13:55:36 2018 +0100
     2.2 +++ b/indra/newview/llstartup.cpp	Sun Jan 07 23:26:10 2018 +0000
     2.3 @@ -3039,12 +3039,18 @@
     2.4  	FSPanelLogin::show(	gViewerWindow->getWindowRectScaled(), login_callback, NULL );
     2.5  	// </FS:Ansariel> [FS Login Panel]
     2.6  
     2.7 -	// <FS:PP> Warning about too high LOD on startup
     2.8 -	if (gSavedSettings.getF32("RenderVolumeLODFactor") >= 4.0f)
     2.9 +	// <FS:Beq> [FIRE-22130] for LOD Factors > 4 reset to the detected dafault 
    2.10 +	F32 old_val = gSavedSettings.getF32("RenderVolumeLODFactor");
    2.11 +	if (old_val > 4.0f)
    2.12  	{
    2.13 -		LLNotificationsUtil::add("RenderVolumeLODFactorWarning");
    2.14 +		U32 gfx_level = gSavedSettings.getU32("RenderQualityPerformance");
    2.15 +		F32 new_val = 2.0; //majority
    2.16 +		if (gfx_level == 0) new_val = 1.125; // low = 0
    2.17 +		if (gfx_level > 5) new_val = 3.0;    // ultra = 6
    2.18 +		gSavedSettings.setF32("RenderVolumeLODFactor", new_val);
    2.19 +		LL_INFOS("AppInit") << "LOD Factor reset to sane value. Was " << old_val << " now " << gSavedSettings.getF32("RenderVolumeLODFactor") << LL_ENDL;
    2.20  	}
    2.21 -	// </FS:PP>
    2.22 +	// </FS:Beq>
    2.23  
    2.24  }
    2.25  
     3.1 --- a/indra/newview/llviewercontrol.cpp	Fri Jan 05 13:55:36 2018 +0100
     3.2 +++ b/indra/newview/llviewercontrol.cpp	Sun Jan 07 23:26:10 2018 +0000
     3.3 @@ -286,7 +286,7 @@
     3.4  	LLVOVolume::sDistanceFactor = 1.f-LLVOVolume::sLODFactor * 0.1f;
     3.5  
     3.6  	// <FS:PP> Warning about too high LOD on LOD change
     3.7 -	if (LLVOVolume::sLODFactor >= 4.0f)
     3.8 +	if (LLVOVolume::sLODFactor > 4.0f)
     3.9  	{
    3.10  		LLNotificationsUtil::add("RenderVolumeLODFactorWarning");
    3.11  	}
     4.1 --- a/indra/newview/skins/default/xui/en/floater_phototools.xml	Fri Jan 05 13:55:36 2018 +0100
     4.2 +++ b/indra/newview/skins/default/xui/en/floater_phototools.xml	Sun Jan 07 23:26:10 2018 +0000
     4.3 @@ -2676,7 +2676,7 @@
     4.4  				 layout="topleft"
     4.5  				 left="5"
     4.6  				 top_pad="5"
     4.7 -				 tool_tip="Controls the detail of prims. Higher values produce greater detail for objects."
     4.8 +				 tool_tip="Controls when lower-detail objects can be used to reduce rendering cost. Higher values cause lag, use with care."
     4.9  				 width="80">
    4.10  					Obj. Detail
    4.11  				</text>
    4.12 @@ -2685,11 +2685,11 @@
    4.13  				 control_name="RenderVolumeLODFactor"
    4.14  				 follows="left|top"
    4.15  				 height="16"
    4.16 -				 increment="1"
    4.17 +				 increment="0.125"
    4.18  				 layout="topleft"
    4.19  				 left_pad="-20"
    4.20  				 min_val="0"
    4.21 -				 max_val="15"
    4.22 +				 max_val="8.0"
    4.23  				 top_delta="-2"
    4.24  				 width="127"/>
    4.25  				<spinner
    4.26 @@ -2698,12 +2698,12 @@
    4.27  				 top_delta="-3"
    4.28  				 label_width="0"
    4.29  				 left_pad="3"
    4.30 -				 decimal_digits="0"
    4.31 +				 decimal_digits="3"
    4.32  				 follows="left|top"
    4.33 -				 max_val="15"
    4.34 +				 max_val="8.0"
    4.35  				 min_val="0"
    4.36  				 width="53"
    4.37 -				 increment="1"/>
    4.38 +				 increment="0.125"/>
    4.39  				<button
    4.40  				 follows="left|top"
    4.41  				 name="Reset_Object_Detail"
     5.1 --- a/indra/newview/skins/default/xui/en/notifications.xml	Fri Jan 05 13:55:36 2018 +0100
     5.2 +++ b/indra/newview/skins/default/xui/en/notifications.xml	Sun Jan 07 23:26:10 2018 +0000
     5.3 @@ -13195,14 +13195,16 @@
     5.4     icon="alert.tga"
     5.5     name="RenderVolumeLODFactorWarning"
     5.6     type="alert">
     5.7 -    WARNING: The Level of Detail (LOD) seems to be set to a high value.
     5.8 -
     5.9 -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.
    5.10 -
    5.11 -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.
    5.12 -    <usetemplate
    5.13 -     ignoretext="Warn about high Level of Detail"
    5.14 -     name="okignore"
    5.15 +    WARNING: The Level of Detail (LOD) Factor is set high
    5.16 +
    5.17 +For everyday use, LOD Factor in the range of 1-3 suffices. 
    5.18 +Consider replacing objects that look deformed at such values.
    5.19 +
    5.20 +LOD Factor >3: Adds to lag. Advised only for photography. 
    5.21 +LOD Factor >4: Use in special circumstances. Reverts after relog.
    5.22 +LOD Factor >8: Has no real effect. May cause errors.
    5.23 +    <usetemplate
    5.24 +     name="okbutton"
    5.25       yestext="OK"/>
    5.26    </notification>
    5.27    <notification
     6.1 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml	Fri Jan 05 13:55:36 2018 +0100
     6.2 +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml	Sun Jan 07 23:26:10 2018 +0000
     6.3 @@ -665,6 +665,7 @@
     6.4  
     6.5          <slider
     6.6           control_name="RenderVolumeLODFactor"
     6.7 +				 tool_tip="Controls when lower-detail objects can be used to reduce rendering cost. Higher values cause lag, use with care."
     6.8           follows="left|top"
     6.9           height="15"
    6.10           increment="0.125"
     7.1 --- a/indra/newview/skins/starlight/xui/en/floater_phototools.xml	Fri Jan 05 13:55:36 2018 +0100
     7.2 +++ b/indra/newview/skins/starlight/xui/en/floater_phototools.xml	Sun Jan 07 23:26:10 2018 +0000
     7.3 @@ -2743,7 +2743,7 @@
     7.4  				 layout="topleft"
     7.5  				 left="5"
     7.6  				 top_pad="5"
     7.7 -				 tool_tip="Controls the detail of prims. Higher values produce greater detail for objects."
     7.8 +				 tool_tip="Controls when lower-detail objects can be used to reduce rendering cost. Higher values cause lag, use with care."
     7.9  				 width="80">
    7.10  					Obj. Detail
    7.11  				</text>
    7.12 @@ -2752,11 +2752,11 @@
    7.13  				 control_name="RenderVolumeLODFactor"
    7.14  				 follows="left|top"
    7.15  				 height="16"
    7.16 -				 increment="1"
    7.17 +				 increment="0.125"
    7.18  				 layout="topleft"
    7.19  				 left_pad="-20"
    7.20  				 min_val="0"
    7.21 -				 max_val="15"
    7.22 +				 max_val="8.0"
    7.23  				 top_delta="-2"
    7.24  				 width="127"/>
    7.25  				<spinner
    7.26 @@ -2765,12 +2765,12 @@
    7.27  				 top_delta="-3"
    7.28  				 label_width="0"
    7.29  				 left_pad="3"
    7.30 -				 decimal_digits="0"
    7.31 +				 decimal_digits="3"
    7.32  				 follows="left|top"
    7.33 -				 max_val="15"
    7.34 +				 max_val="8.0"
    7.35  				 min_val="0"
    7.36  				 width="53"
    7.37 -				 increment="1"/>
    7.38 +				 increment="0.125"/>
    7.39  				<button
    7.40  				 follows="left|top"
    7.41  				 name="Reset_Object_Detail"
     8.1 --- a/indra/newview/skins/starlightcui/xui/en/floater_phototools.xml	Fri Jan 05 13:55:36 2018 +0100
     8.2 +++ b/indra/newview/skins/starlightcui/xui/en/floater_phototools.xml	Sun Jan 07 23:26:10 2018 +0000
     8.3 @@ -2743,8 +2743,8 @@
     8.4  				 layout="topleft"
     8.5  				 left="5"
     8.6  				 top_pad="5"
     8.7 -				 tool_tip="Controls the detail of prims. Higher values produce greater detail for objects."
     8.8 -				 width="80">
     8.9 +				 tool_tip="Controls when lower-detail objects can be used to reduce rendering cost. Higher values cause lag, use with care."
    8.10 +         width="80">
    8.11  					Obj. Detail
    8.12  				</text>
    8.13  				<slider_bar
    8.14 @@ -2752,11 +2752,11 @@
    8.15  				 control_name="RenderVolumeLODFactor"
    8.16  				 follows="left|top"
    8.17  				 height="16"
    8.18 -				 increment="1"
    8.19 +				 increment="0.125"
    8.20  				 layout="topleft"
    8.21  				 left_pad="-20"
    8.22  				 min_val="0"
    8.23 -				 max_val="15"
    8.24 +				 max_val="8.0"
    8.25  				 top_delta="-2"
    8.26  				 width="127"/>
    8.27  				<spinner
    8.28 @@ -2767,10 +2767,10 @@
    8.29  				 left_pad="3"
    8.30  				 decimal_digits="0"
    8.31  				 follows="left|top"
    8.32 -				 max_val="15"
    8.33 +				 max_val="8.0"
    8.34  				 min_val="0"
    8.35  				 width="53"
    8.36 -				 increment="1"/>
    8.37 +				 increment="0.125"/>
    8.38  				<button
    8.39  				 follows="left|top"
    8.40  				 name="Reset_Object_Detail"

mercurial