Scratching an ooooold itch: added 'Gestures' slider and mute button to the audio controls

3 files changed, 14 insertions, 6 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_audio.xml b/linden/indra/newview/skins/default/xui/en-us/panel_audio.xml
index ee9695e..c6e75fc 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_audio.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_audio.xml
@@ -49,6 +49,14 @@
              image_selected="icn_speaker-muted_dark.tga"
              image_unselected="icn_speaker_dark.tga" label="" label_width="55"
              left="150" name="mute_wind" tab_stop="false" toggle="true" width="25" />
+  <slider bottom_delta="-20" control_name="AudioLevelGestures" follows="left|top|right"
+       height="15" increment="0.05" initial_val="0.5" label="Gestures:"
+       label_width="55" left="10" max_val="1" min_val="0" name="Gestures"
+       show_text="false" volume="true" width="180" />
+  <button bottom_delta="0" control_name="MuteGestures" follows="top|right" height="16"
+             image_selected="icn_speaker-muted_dark.tga"
+             image_unselected="icn_speaker_dark.tga" label="" label_width="55"
+             left="150" name="mute_gestures" tab_stop="false" toggle="true" width="25" />
         <slider bottom_delta="-20" control_name="AudioLevelUI" follows="left|top|right"
              height="15" increment="0.05" initial_val="0.5" label="Interface:" label_width="55"
              left="10" max_val="1" min_val="0" name="UI Volume" show_text="false"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_media_remote_expanded.xml b/linden/indra/newview/skins/default/xui/en-us/panel_media_remote_expanded.xml
index 7266536..3fdea5e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_media_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_media_remote_expanded.xml
@@ -2,8 +2,8 @@
 <panel bg_visible="false" border="false" border_visible="false" bottom="1"
      follows="right|bottom" height="185" left="0" name="media_remote"
      use_bounding_rect="true" width="220">
-        <panel bottom="0" filename="panel_bg_tab.xml" height="187" left="0" width="220" />
-        <panel border="false" bottom="22" filename="panel_audio.xml" height="160"
+        <panel bottom="0" filename="panel_bg_tab.xml" height="197" left="0" width="220" />
+        <panel border="false" bottom="22" filename="panel_audio.xml" height="174"
              label="Audio &amp; Video" name="Volume Panel" width="220" />
         <panel bottom_delta="-10" filename="panel_media_controls.xml" left="0" />
                 <string name="play_label">
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 400da56..c6bb938 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
@@ -20,10 +20,10 @@
              mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128">
                 Audio:
         </text>
-        <panel border="true" bottom="-195" enabled="true" filename="panel_audio.xml"
+        <panel border="true" bottom="-187" 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="-195" control_name="AudioStreamingMusic" enabled="true"
+        <check_box bottom="-205" 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,7 +42,7 @@
              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="-34" control_name="MuteWhenMinimized" enabled="true"
+        <check_box bottom_delta="-27" 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" />
@@ -57,7 +57,7 @@
              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"
+       bottom_delta="-27" 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: