Moved 'Mute wind' into Preferences > Audio, rearranged the audio preferences a little

5 files changed, 35 insertions, 23 deletions

diff --git a/linden/indra/newview/llpanelaudioprefs.cpp b/linden/indra/newview/llpanelaudioprefs.cpp
index 7ad8712..2bb3ab4 100644
--- a/linden/indra/newview/llpanelaudioprefs.cpp
+++ b/linden/indra/newview/llpanelaudioprefs.cpp
@@ -91,6 +91,7 @@ BOOL LLPanelAudioPrefs::postBuild()
 {
         refreshValues(); // initialize member data from saved settings
         childSetLabelArg("L$ Change Threshold", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
+        childSetValue("mute_wind_check", !gSavedSettings.getBOOL("MuteWind"));
 
         return TRUE;
 }
@@ -117,6 +118,13 @@ void LLPanelAudioPrefs::refreshValues()
         mPreviousMuteWhenMinimized = gSavedSettings.getBOOL("MuteWhenMinimized");
 }
 
+void LLPanelAudioPrefs::apply()
+{
+        refreshValues();
+
+        gSavedSettings.setBOOL("MuteWind", !(BOOL)(childGetValue("mute_wind_check").asBoolean()));
+}
+
 void LLPanelAudioPrefs::cancel()
 {
         gSavedSettings.setF32("AudioLevelMaster", mPreviousVolume );
diff --git a/linden/indra/newview/llpanelaudioprefs.h b/linden/indra/newview/llpanelaudioprefs.h
index 08009c9..21d2f59 100644
--- a/linden/indra/newview/llpanelaudioprefs.h
+++ b/linden/indra/newview/llpanelaudioprefs.h
@@ -48,7 +48,7 @@ public:
         LLPanelAudioPrefs();
         virtual ~LLPanelAudioPrefs();
         
-        void apply() { refreshValues(); }
+        void apply();
         void cancel();  // Cancel the changed values.
 
         virtual BOOL postBuild();
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index a4c0dc2..d96f97e 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -61,7 +61,6 @@ BOOL LLPrefsAdvanced::postBuild()
         childSetValue("speed_rez_check", gSavedSettings.getBOOL("SpeedRez"));
         childSetValue("speed_rez_interval_spinner", (F32)gSavedSettings.getU32("SpeedRezInterval"));
         childSetValue("appearance_anim_check", gSavedSettings.getBOOL("AppearanceAnimate"));
-        childSetValue("mute_wind_check", !gSavedSettings.getBOOL("MuteWind"));
 
         refresh();
 
@@ -77,7 +76,6 @@ void LLPrefsAdvanced::apply()
         gSavedSettings.setBOOL("SpeedRez", childGetValue("speed_rez_check"));
         gSavedSettings.setU32("SpeedRezInterval", childGetValue("speed_rez_interval_spinner").asReal());
         gSavedSettings.setBOOL("AppearanceAnimate", childGetValue("appearance_anim_check"));
-        gSavedSettings.setBOOL("MuteWind", !(BOOL)(childGetValue("mute_wind_check").asBoolean()));
         gSavedSettings.setBOOL("UseServersideWindlightSettings", childGetValue("windlight_check"));
 
         // Need to force a rebake when ClothingLayerProtection toggled for it take effect -- MC
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index d1a7489..6766cf3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -52,10 +52,6 @@
        tool_tip="Toggle editing animation and standing up when entering appearance mode" 
        label="Animate avatar when editing appearance" left="12" mouse_opaque="true"
        name="appearance_anim_check" radio_style="false" width="217" />
-  <check_box bottom_delta="-25" enabled="true" follows="left|top"
-       font="SansSerifSmall" height="16" initial_value="false"
-       label="Enable wind" left="12" mouse_opaque="true"
-       name="mute_wind_check" radio_style="false" width="217" />
 
   <button bottom="5" follows="left|top" font="SansSerifSmall" height="20" width="250" 
        label="Reset All Preferences To Default" name="reset_btn" left="12" 
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
index 3f8b99a..400da56 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
@@ -9,13 +9,13 @@
                 Volume:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-215" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-190" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
              mouse_opaque="true" name="streaming_prefs_text" v_pad="0" width="128">
                 Streaming:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-300" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-285" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
              mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128">
                 Audio:
@@ -23,7 +23,7 @@
         <panel border="true" bottom="-195" enabled="true" filename="panel_audio.xml"
              follows="left|top|right|bottom" height="180" label="Volume" left="148"
              mouse_opaque="true" name="Volume Panel" width="260" />
-        <check_box bottom="-220" control_name="AudioStreamingMusic" enabled="true"
+        <check_box bottom="-195" control_name="AudioStreamingMusic" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
              label="Play streaming music when available (uses more bandwidth)"
              left="142" mouse_opaque="true" name="streaming_music" radio_style="false"
@@ -42,28 +42,38 @@
              initial_value="true" label="Automatically play media" left="162"
              mouse_opaque="true" name="auto_streaming_video" radio_style="false"
              width="338" />
-        <check_box bottom_delta="-25" control_name="MuteWhenMinimized" enabled="true"
+        <check_box bottom_delta="-34" control_name="MuteWhenMinimized" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
              label="Mute audio when window minimized" left="142" mouse_opaque="true"
              name="mute_when_minimized" radio_style="false" width="215" />
-        <slider bottom_delta="-25" control_name="AudioLevelDoppler" edit_text="true"
-             enabled="true" follows="left|top" height="15" increment="0.1"
-             initial_val="1" label="Doppler effect:" label_width="100" left="148"
-             max_val="2" min_val="0" mouse_opaque="true" name="Doppler Effect"
-             show_text="true" width="250" />
-        <slider bottom_delta="-20" control_name="AudioLevelRolloff" edit_text="true"
-             enabled="true" follows="left|top" height="15" increment="0.1"
-             initial_val="1" label="Rolloff factor:" label_width="100" left="148"
-             max_val="2" min_val="0" mouse_opaque="true" name="Rolloff Factor"
-             show_text="true" width="250" />
-        <spinner bottom_delta="-25" control_name="UISndMoneyChangeThreshold" decimal_digits="0"
+  <spinner bottom_delta="-20" control_name="UISndMoneyChangeThreshold" decimal_digits="0"
              enabled="true" follows="left|top" height="16" increment="10"
              initial_val="10" label="[CURRENCY] change threshold:" label_width="158" left="148"
              max_val="10000" min_val="0" mouse_opaque="true" name="L$ Change Threshold"
              width="212" />
-        <spinner bottom_delta="-20" control_name="UISndHealthReductionThreshold"
+  <spinner bottom_delta="-20" control_name="UISndHealthReductionThreshold"
              decimal_digits="0" enabled="true" follows="left|top" height="16"
              increment="10" initial_val="20" label="Health change threshold:"
              label_width="158" left="148" max_val="10000" min_val="0"
              mouse_opaque="true" name="Health change threshold" width="212" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
+       mouse_opaque="true" name="ambient_prefs_text" v_pad="0" width="128">
+    Ambient:
+  </text>
+  <check_box bottom_delta="-4" enabled="true" follows="left|top"
+       font="SansSerifSmall" height="16" initial_value="false"
+       label="Enable wind generation" left="142" mouse_opaque="true"
+       name="mute_wind_check" radio_style="false" width="217" />
+  <slider bottom_delta="-20" control_name="AudioLevelDoppler" edit_text="true"
+       enabled="true" follows="left|top" height="15" increment="0.1"
+       initial_val="1" label="Doppler effect:" label_width="100" left="148"
+       max_val="2" min_val="0" mouse_opaque="true" name="Doppler Effect"
+       show_text="true" width="250" />
+  <slider bottom_delta="-20" control_name="AudioLevelRolloff" edit_text="true"
+             enabled="true" follows="left|top" height="15" increment="0.1"
+             initial_val="1" label="Rolloff factor:" label_width="100" left="148"
+             max_val="2" min_val="0" mouse_opaque="true" name="Rolloff Factor"
+             show_text="true" width="250" />
 </panel>