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

SL-17706 Deprecate avatar cloth and remove dead UI from graphics preferences.

meow-7.2.2
Dave Parks 2022-08-03 10:08:52 -05:00
parent cf4b14f691
commit 53bd8819f7
6 changed files with 13 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8806,13 +8806,13 @@
<key>RenderAvatarCloth</key>
<map>
<key>Comment</key>
<string>Controls if avatars use wavy cloth</string>
<string>DEPRECATED - only false supported - Controls if avatars use wavy cloth</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
<integer>0</integer>
</map>
<key>RenderComplexityColorMin</key>
<map>

10
indra/newview/featuretable.txt
View File

@ -28,7 +28,7 @@ version 35
//
list all
RenderAnisotropic 1 1
RenderAvatarCloth 1 1
RenderAvatarCloth 0 0
RenderAvatarLODFactor 1 1.0
RenderAvatarPhysicsLODFactor 1 1.0
RenderAvatarMaxNonImpostors 1 16
@ -79,7 +79,6 @@ RenderGLMultiThreaded 1 1
//
list Low
RenderAnisotropic 1 0
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 0
RenderAvatarPhysicsLODFactor 1 0
RenderAvatarMaxNonImpostors 1 3
@ -107,7 +106,6 @@ RenderFSAASamples 1 0
//
list LowMid
RenderAnisotropic 1 0
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 0.5
RenderAvatarMaxComplexity 1 100000
RenderAvatarPhysicsLODFactor 1 0.75
@ -134,7 +132,6 @@ RenderFSAASamples 1 0
//
list Mid
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
RenderAvatarMaxComplexity 1 200000
RenderAvatarPhysicsLODFactor 1 1.0
@ -160,7 +157,6 @@ RenderFSAASamples 1 2
//
list MidHigh
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
RenderAvatarMaxComplexity 1 250000
RenderAvatarPhysicsLODFactor 1 1.0
@ -186,7 +182,6 @@ RenderFSAASamples 1 2
//
list High
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
RenderAvatarMaxComplexity 1 300000
RenderAvatarPhysicsLODFactor 1 1.0
@ -212,7 +207,6 @@ RenderFSAASamples 1 2
//
list HighUltra
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
RenderAvatarMaxComplexity 1 350000
RenderAvatarPhysicsLODFactor 1 1.0
@ -238,7 +232,6 @@ RenderFSAASamples 1 2
//
list Ultra
RenderAnisotropic 1 1
RenderAvatarCloth 1 1
RenderAvatarLODFactor 1 1.0
RenderAvatarPhysicsLODFactor 1 1.0
RenderFarClip 1 256
@ -279,7 +272,6 @@ RenderCompressTextures 1 0
//
list safe
RenderAnisotropic 1 0
RenderAvatarCloth 0 0
RenderAvatarMaxNonImpostors 1 16
RenderAvatarMaxComplexity 1 80000
RenderLocalLights 1 0

10
indra/newview/featuretable_mac.txt
View File

@ -28,7 +28,7 @@ version 39
//
list all
RenderAnisotropic 1 0
RenderAvatarCloth 1 1
RenderAvatarCloth 0 0
RenderAvatarLODFactor 1 1.0
RenderAvatarPhysicsLODFactor 1 1.0
RenderAvatarMaxNonImpostors 1 16
@ -79,7 +79,6 @@ RenderGLMultiThreaded 1 0
//
list Low
RenderAnisotropic 1 0
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 0
RenderAvatarPhysicsLODFactor 1 0
RenderAvatarMaxNonImpostors 1 3
@ -107,7 +106,6 @@ RenderFSAASamples 1 0
//
list LowMid
RenderAnisotropic 1 0
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 0.5
RenderAvatarMaxComplexity 1 100000
RenderAvatarPhysicsLODFactor 1 0.75
@ -134,7 +132,6 @@ RenderFSAASamples 1 0
//
list Mid
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
RenderAvatarMaxComplexity 1 200000
RenderAvatarPhysicsLODFactor 1 1.0
@ -160,7 +157,6 @@ RenderFSAASamples 1 2
//
list MidHigh
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
RenderAvatarMaxComplexity 1 250000
RenderAvatarPhysicsLODFactor 1 1.0
@ -186,7 +182,6 @@ RenderFSAASamples 1 2
//
list High
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
RenderAvatarMaxComplexity 1 300000
RenderAvatarPhysicsLODFactor 1 1.0
@ -212,7 +207,6 @@ RenderFSAASamples 1 2
//
list HighUltra
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
RenderAvatarMaxComplexity 1 350000
RenderAvatarPhysicsLODFactor 1 1.0
@ -238,7 +232,6 @@ RenderFSAASamples 1 2
//
list Ultra
RenderAnisotropic 1 1
RenderAvatarCloth 1 1
RenderAvatarLODFactor 1 1.0
RenderAvatarPhysicsLODFactor 1 1.0
RenderFarClip 1 256
@ -280,7 +273,6 @@ RenderCompressTextures 1 0
//
list safe
RenderAnisotropic 1 0
RenderAvatarCloth 0 0
RenderAvatarMaxNonImpostors 1 16
RenderAvatarMaxComplexity 1 80000
RenderLocalLights 1 0

40
indra/newview/llfloaterpreference.cpp
View File

@ -1227,51 +1227,21 @@ void LLFloaterPreferenceGraphicsAdvanced::refreshEnabledState()
ctrl_reflections->setEnabled(reflections);
reflections_text->setEnabled(reflections);
// Bump & Shiny
LLCheckBoxCtrl* bumpshiny_ctrl = getChild<LLCheckBoxCtrl>("BumpShiny");
bool bumpshiny = gGLManager.mHasCubeMap && LLCubeMap::sUseCubeMaps && LLFeatureManager::getInstance()->isFeatureAvailable("RenderObjectBump");
bumpshiny_ctrl->setEnabled(bumpshiny ? TRUE : FALSE);
// Avatar Mode
// Avatar Render Mode
getChild<LLCheckBoxCtrl>("AvatarCloth")->setEnabled(TRUE);
// Vertex Shaders, Global Shader Enable
// SL-12594 Basic shaders are always enabled. DJH TODO clean up now-orphaned state handling code
LLSliderCtrl* terrain_detail = getChild<LLSliderCtrl>("TerrainDetail"); // can be linked with control var
LLTextBox* terrain_text = getChild<LLTextBox>("TerrainDetailText");
terrain_detail->setEnabled(FALSE);
terrain_text->setEnabled(FALSE);
// WindLight
LLCheckBoxCtrl* ctrl_wind_light = getChild<LLCheckBoxCtrl>("WindLightUseAtmosShaders");
LLSliderCtrl* sky = getChild<LLSliderCtrl>("SkyMeshDetail");
LLTextBox* sky_text = getChild<LLTextBox>("SkyMeshDetailText");
ctrl_wind_light->setEnabled(TRUE);
sky->setEnabled(TRUE);
sky_text->setEnabled(TRUE);
//Deferred/SSAO/Shadows
LLCheckBoxCtrl* ctrl_deferred = getChild<LLCheckBoxCtrl>("UseLightShaders");
BOOL enabled = LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") &&
((bumpshiny_ctrl && bumpshiny_ctrl->get()) ? TRUE : FALSE) &&
gGLManager.mHasFramebufferObject &&
(ctrl_wind_light->get()) ? TRUE : FALSE;
ctrl_deferred->setEnabled(enabled);
LLCheckBoxCtrl* ctrl_ssao = getChild<LLCheckBoxCtrl>("UseSSAO");
LLCheckBoxCtrl* ctrl_dof = getChild<LLCheckBoxCtrl>("UseDoF");
LLComboBox* ctrl_shadow = getChild<LLComboBox>("ShadowDetail");
LLTextBox* shadow_text = getChild<LLTextBox>("RenderShadowDetailText");
// note, okay here to get from ctrl_deferred as it's twin, ctrl_deferred2 will alway match it
enabled = enabled && LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferredSSAO") && (ctrl_deferred->get() ? TRUE : FALSE);
BOOL enabled = LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferredSSAO");
ctrl_deferred->set(gSavedSettings.getBOOL("RenderDeferred"));
ctrl_ssao->setEnabled(enabled);
ctrl_dof->setEnabled(enabled);
@ -1356,7 +1326,6 @@ void LLFloaterPreferenceGraphicsAdvanced::disableUnavailableSettings()
{
LLComboBox* ctrl_reflections = getChild<LLComboBox>("Reflections");
LLTextBox* reflections_text = getChild<LLTextBox>("ReflectionsText");
LLCheckBoxCtrl* ctrl_avatar_cloth = getChild<LLCheckBoxCtrl>("AvatarCloth");
LLCheckBoxCtrl* ctrl_wind_light = getChild<LLCheckBoxCtrl>("WindLightUseAtmosShaders");
LLCheckBoxCtrl* ctrl_deferred = getChild<LLCheckBoxCtrl>("UseLightShaders");
LLComboBox* ctrl_shadows = getChild<LLComboBox>("ShadowDetail");
@ -1430,13 +1399,6 @@ void LLFloaterPreferenceGraphicsAdvanced::disableUnavailableSettings()
ctrl_reflections->setValue(FALSE);
reflections_text->setEnabled(FALSE);
}
// disabled cloth
if (!LLFeatureManager::getInstance()->isFeatureAvailable("RenderAvatarCloth"))
{
ctrl_avatar_cloth->setEnabled(FALSE);
ctrl_avatar_cloth->setValue(FALSE);
}
}
void LLFloaterPreference::refresh()

1
indra/newview/llviewercontrol.cpp
View File

@ -663,7 +663,6 @@ void settings_setup_listeners()
gSavedSettings.getControl("RenderGlow")->getSignal()->connect(boost::bind(&handleReleaseGLBufferChanged, _2));
gSavedSettings.getControl("RenderGlow")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
gSavedSettings.getControl("RenderGlowResolutionPow")->getSignal()->connect(boost::bind(&handleReleaseGLBufferChanged, _2));
gSavedSettings.getControl("RenderAvatarCloth")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
gSavedSettings.getControl("WindLightUseAtmosShaders")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
gSavedSettings.getControl("RenderGammaFull")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
gSavedSettings.getControl("RenderVolumeLODFactor")->getSignal()->connect(boost::bind(&handleVolumeLODChanged, _2));

105
indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
View File

@ -612,51 +612,6 @@
top_delta="16"
width="300" />
<slider
control_name="RenderTerrainDetail"
follows="left|top"
height="16"
label="Terrain Detail:"
label_width="165"
layout="topleft"
left="440"
show_text="false"
initial_value="0"
increment="1"
min_val="0"
max_val="1"
name="TerrainDetail"
top_delta="16"
width="280" >
<slider.commit_callback
function="Pref.UpdateSliderText"
parameter="TerrainDetail" />
</slider>
<text
type="string"
length="1"
follows="left|top"
height="16"
layout="topleft"
top_delta="0"
left_delta="284"
name="TerrainDetailText"
text_readonly_color="LabelDisabledColor"
width="65">
Low
</text>
<check_box
control_name="RenderAvatarCloth"
height="16"
initial_value="true"
label="Avatar cloth"
layout="topleft"
left="440"
name="AvatarCloth"
top_delta="16"
width="280" />
<text
type="string"
length="1"
@ -666,7 +621,7 @@
name="ReflectionsText"
text_readonly_color="LabelDisabledColor"
top_delta="16"
left="440"
left="420"
width="128">
Water Reflections:
</text>
@ -708,20 +663,6 @@
value="4"/>
</combo_box>
<check_box
control_name="WindLightUseAtmosShaders"
height="16"
initial_value="true"
label="Atmospheric shaders"
layout="topleft"
left="440"
name="WindLightUseAtmosShaders"
top_delta="16"
width="280">
<check_box.commit_callback
function="Pref.RenderOptionUpdate" />
</check_box>
<slider
control_name="WLSkyDetail"
decimal_digits="0"
@ -732,7 +673,7 @@
label="Sky:"
label_width="145"
layout="topleft"
left="460"
left="420"
min_val="16"
max_val="128"
name="SkyMeshDetail"
@ -757,27 +698,13 @@
Low
</text>
<check_box
control_name="RenderDeferred"
height="16"
initial_value="true"
label="Advanced Lighting Model"
layout="topleft"
left="460"
name="UseLightShaders"
top_delta="16"
width="260">
<check_box.commit_callback
function="Pref.RenderOptionUpdate" />
</check_box>
<check_box
control_name="RenderDeferredSSAO"
height="16"
initial_value="true"
label="Ambient Occlusion"
layout="topleft"
left="480"
left="420"
name="UseSSAO"
top_delta="16"
width="240">
@ -791,7 +718,7 @@
initial_value="true"
label="Depth of Field"
layout="topleft"
left="480"
left="420"
name="UseDoF"
top_delta="16"
width="240">
@ -799,29 +726,13 @@
function="Pref.RenderOptionUpdate" />
</check_box>
<!--
<check_box
control_name="RenderUseAdvancedAtmospherics"
height="16"
initial_value="true"
label="Advanced Atmospherics"
layout="topleft"
left="480"
name="UseAdvancedAtmo"
top_delta="16"
width="240">
<check_box.commit_callback
function="Pref.AdvancedAtmosphericsEnable" />
</check_box>
-->
<text
type="string"
length="1"
follows="left|top"
height="16"
layout="topleft"
left="480"
left="420"
name="RenderShadowDetailText"
text_readonly_color="LabelDisabledColor"
top_delta="16"
@ -855,7 +766,7 @@
follows="left|top"
height="16"
layout="topleft"
left="480"
left="420"
name="RenderReflectionDetailText"
text_readonly_color="LabelDisabledColor"
top_delta="16"
@ -891,7 +802,7 @@
layout="topleft"
left="13"
name="horiz_border"
top_pad="21"
top="338"
top_delta="5"
width="774"/>
<button
@ -901,7 +812,7 @@
layout="topleft"
left="20"
name="Defaults"
top_delta="10"
top_delta="20"
width="210">
<button.commit_callback
function="Pref.HardwareDefaults" />