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

4 files changed, 5 insertions, 5 deletions

diff --git a/indra/newview/llfloaterperformance.cpp b/indra/newview/llfloaterperformance.cpp
index e45d7a0c73..c89c58c401 100644
--- a/indra/newview/llfloaterperformance.cpp
+++ b/indra/newview/llfloaterperformance.cpp
@@ -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));
diff --git a/indra/newview/llfloaterpreferencesgraphicsadvanced.cpp b/indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
index 85a0fee143..ba2fd6eef2 100644
--- a/indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
+++ b/indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
@@ -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;
 }
 
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index b02eb62112..154c8b7909 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -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"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 98f74d321b..1b9df53ad2 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -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