From b4c68d56b6e94e127e9fc27e3b9ea904960bd248 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Tue, 7 Feb 2012 12:43:12 +0100
Subject: [PATCH] Reverting Lirusaito's botch on volume controls

---
 .../skins/default/xui/en-us/panel_audio.xml   | 73 +++++++++++++++----
 1 file changed, 58 insertions(+), 15 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/panel_audio.xml b/indra/newview/skins/default/xui/en-us/panel_audio.xml
index 6375db480..b9877c8bf 100644
--- a/indra/newview/skins/default/xui/en-us/panel_audio.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_audio.xml
@@ -1,17 +1,60 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="false" height="100" label="Audio &amp; Video" name="Media panel" width="250">
-	<slider control_name="AudioLevelMaster" follows="top" height="15" increment="0.005" initial_val="0.5" label="Master" label_width="40" left="3" max_val="1" min_val="0" name="System Volume" show_text="false" volume="true" width="188"/>
-	<button bottom_delta="0" control_name="MuteAudio" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_audio" toggle="true" width="25"/>
-	<slider bottom_delta="-30" control_name="AudioLevelMusic" follows="top" height="15" increment="0.005" initial_val="0.5" label="Music" label_width="40" left="3" max_val="1" min_val="0" name="Music Volume" show_text="false" volume="true" width="188"/>
-	<button bottom_delta="0" control_name="MuteMusic" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_music" toggle="true" width="25"/>
-	<slider control_name="AudioLevelMedia" follows="top" height="15" increment="0.005" initial_val="0.5" label="Media" label_width="40" left="3" max_val="1" min_val="0" name="Media Volume" show_text="false" volume="true" width="188"/>
-	<button bottom_delta="0" control_name="MuteMedia" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_media" toggle="true" width="25"/>
-	<slider control_name="AudioLevelVoice" follows="top" height="15" increment="0.005" initial_val="0.5" label="Voice" label_width="40" left="3" max_val="1" min_val="0" name="Voice Volume" show_text="false" volume="true" width="188"/>
-	<button bottom_delta="0" control_name="MuteVoice" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_voice" toggle="true" width="25"/>
-	<slider control_name="AudioLevelSFX" follows="top" height="15" increment="0.005" initial_val="0.5" label="Sounds" label_width="40" left="3" max_val="1" min_val="0" name="SFX Volume" show_text="false" volume="true" width="188"/>
-	<button bottom_delta="0" control_name="MuteSounds" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_sfx" toggle="true" width="25"/>
-	<slider control_name="AudioLevelAmbient" follows="top" height="15" increment="0.005" initial_val="0.5" label="Ambient" label_width="40" left="3" max_val="1" min_val="0" name="Wind Volume" show_text="false" volume="true" width="188"/>
-	<button bottom_delta="0" control_name="MuteAmbient" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" right="-28" label="" name="mute_wind" toggle="true" width="25"/>
-	<slider control_name="AudioLevelUI" follows="top" height="15" increment="0.005" initial_val="0.5" label="UI" label_width="40" left="3" max_val="1" min_val="0" name="UI Volume" show_text="false" volume="true" width="188"/>
-	<button bottom_delta="0" control_name="MuteUI" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" right="-28" label="" name="mute_ui" toggle="true" width="25"/>
+<panel border="false" follows="left|top|right|bottom" height="160"
+     label="Audio &amp; Video" name="Media panel" width="175">
+	<slider bottom_delta="-20" control_name="AudioLevelMaster" follows="left|top|right"
+	     height="15" increment="0.05" initial_val="0.5" label="Master"
+	     label_width="55" left="10" max_val="1" min_val="0" mouse_opaque="true"
+	     name="System Volume" show_text="false" volume="true" width="180" />
+	<button bottom_delta="0" control_name="MuteAudio" 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_audio" tab_stop="false" toggle="true" width="25" />
+	<slider bottom_delta="-30" control_name="AudioLevelMusic" follows="left|top|right"
+	     height="15" increment="0.05" initial_val="0.5" label="Music"
+	     label_width="55" left="10" max_val="1" min_val="0" name="Music Volume"
+	     show_text="false" volume="true" width="180" />
+	<button bottom_delta="0" control_name="MuteMusic" 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_music" tab_stop="false" toggle="true" width="25" />
+	<slider bottom_delta="-20" control_name="AudioLevelMedia" follows="left|top|right"
+	     height="15" increment="0.05" initial_val="0.5" label="Media"
+	     label_width="55" left="10" max_val="1" min_val="0" name="Media Volume"
+	     show_text="false" volume="true" width="180" />
+	<button bottom_delta="0" control_name="MuteMedia" 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_media" tab_stop="false" toggle="true" width="25" />
+	<slider bottom_delta="-20" control_name="AudioLevelVoice" follows="left|top|right"
+	     height="15" increment="0.05" initial_val="0.5" label="Voice"
+	     label_width="55" left="10" max_val="1" min_val="0" name="Voice Volume"
+	     show_text="false" volume="true" width="180" />
+	<button bottom_delta="0" control_name="MuteVoice" 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_voice" tab_stop="false" toggle="true" width="25" />
+	<slider bottom_delta="-20" control_name="AudioLevelSFX" follows="left|top|right"
+	     height="15" increment="0.05" initial_val="0.5" label="Sounds"
+	     label_width="55" left="10" max_val="1" min_val="0" name="SFX Volume"
+	     show_text="false" volume="true" width="180" />
+	<button bottom_delta="0" control_name="MuteSounds" 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_sfx" tab_stop="false" toggle="true" width="25" />
+	<slider bottom_delta="-20" control_name="AudioLevelAmbient" follows="left|top|right"
+	     height="15" increment="0.05" initial_val="0.5" label="Ambient"
+	     label_width="55" left="10" max_val="1" min_val="0" name="Wind Volume"
+	     show_text="false" volume="true" width="180" />
+	<button bottom_delta="0" control_name="MuteAmbient" 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_wind" 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="UI" label_width="55"
+	     left="10" max_val="1" min_val="0" name="UI Volume" show_text="false"
+	     volume="true" width="180" />
+	<button bottom_delta="0" control_name="MuteUI" 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_ui" tab_stop="false" toggle="true" width="25" />
 </panel>