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

SL-16627 show auto-adjustment warning when for Shadows quality and Water reflection settings

master
Mnikolenko Productengine 2022-03-17 18:47:42 +02:00
parent d922d2ba7d
commit e5e710a1e6
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llfloaterperformance.cpp
View File

@ -123,6 +123,7 @@ BOOL LLFloaterPerformance::postBuild()
mSettingsPanel->getChild<LLRadioGroup>("graphics_quality")->setCommitCallback(boost::bind(&LLFloaterPerformance::onChangeQuality, this, _2));
mSettingsPanel->getChild<LLCheckBoxCtrl>("advanced_lighting_model")->setMouseDownCallback(boost::bind(&LLFloaterPerformance::onClickAdvancedLighting, this));
mSettingsPanel->getChild<LLComboBox>("ShadowDetail")->setMouseDownCallback(boost::bind(&LLFloaterPerformance::onClickShadows, this));
mSettingsPanel->getChild<LLComboBox>("Reflections")->setMouseDownCallback(boost::bind(&LLFloaterPreference::showAutoAdjustWarning));
mNearbyPanel->getChild<LLButton>("exceptions_btn")->setCommitCallback(boost::bind(&LLFloaterPerformance::onClickExceptions, this));
mNearbyPanel->getChild<LLCheckBoxCtrl>("hide_avatars")->setCommitCallback(boost::bind(&LLFloaterPerformance::onClickHideAvatars, this));

3
indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
View File

@ -81,6 +81,9 @@ BOOL LLFloaterPreferenceGraphicsAdvanced::postBuild()
mComplexityChangedSignal = gSavedSettings.getControl("RenderAvatarMaxComplexity")->getCommitSignal()->connect(boost::bind(&LLFloaterPreferenceGraphicsAdvanced::updateComplexityText, this));
getChild<LLComboBox>("ShadowDetail")->setMouseDownCallback(boost::bind(&LLFloaterPreference::showAutoAdjustWarning));
getChild<LLComboBox>("Reflections")->setMouseDownCallback(boost::bind(&LLFloaterPreference::showAutoAdjustWarning));
return TRUE;
}

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

@ -697,8 +697,6 @@
top_delta="0"
name="Reflections"
width="150">
<combo_box.mouse_down_callback
function="Pref.AutoAdjustWarning" />
<combo_box.item
label="None; opaque"
name="0"
@ -857,8 +855,6 @@
top_delta="0"
name="ShadowDetail"
width="150">
<combo_box.mouse_down_callback
function="Pref.AutoAdjustWarning" />
<combo_box.item
label="None"
name="0"

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

@ -1864,7 +1864,7 @@ Graphics Quality can be raised in Preferences &gt; Graphics.
icon="alertmodal.tga"
name="AutoFPSConfirmDisable"
type="alertmodal">
Changing this setting will disable automatic adjustment and turn off 'Auto FPS' setting.
Changing this setting will disable automatic adjustment and turn off 'Automatic settings'.
Are you sure you want to continue?
<tag>confirm</tag>
<usetemplate