From 385ec62e53b2e998c4431eadcd10dbe12f073ff8 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Wed, 14 Mar 2012 08:55:10 -0400
Subject: [PATCH] Added scale_image="false" to all mute buttons.

This will allow the mute icons to retain their normal look,
with Shyotl's changes to the UI code.
---
 .../xui/en-us/floater_active_speakers.xml        |  2 +-
 .../xui/en-us/floater_instant_message.xml        |  2 +-
 .../skins/default/xui/en-us/panel_audio.xml      | 16 ++++++++--------
 .../default/xui/en-us/panel_master_volume.xml    |  2 +-
 .../default/xui/en-us/panel_media_controls.xml   |  2 +-
 .../default/xui/en-us/panel_speaker_controls.xml |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/floater_active_speakers.xml b/indra/newview/skins/default/xui/en-us/floater_active_speakers.xml
index c74da2f54..a808fc5f8 100644
--- a/indra/newview/skins/default/xui/en-us/floater_active_speakers.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_active_speakers.xml
@@ -23,7 +23,7 @@
 			<button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga"
 			     image_unselected="icn_speaker_dark.tga" label="" left_delta="115"
 			     name="mute_btn" toggle="true" tool_tip="Mute voice for this resident"
-			     width="25" />
+			     width="25" scale_image="false" />
 		</panel>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index e72b13d98..432cf712a 100644
--- a/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -19,7 +19,7 @@
 	<button bottom="-37" follows="top" height="20" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" label="End" name="end_call_btn" visible="false" width="80"/>
 	<panel border="false" bottom="-34" follows="left|top" height="20" left_delta="50" name="speaker_controls" width="100">
 		<volume_slider bottom="0" follows="bottom" height="15" increment="0.05" initial_val="0.5" max_val="1.0" min_val="0.0" name="speaker_volume" width="56"/>
-		<button bottom="0" height="20" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" left_delta="56" name="mute_btn" tool_tip="Mute voice" width="25"/>
+		<button bottom="0" height="20" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" label="" left_delta="56" name="mute_btn" tool_tip="Mute voice" width="25"/>
 	</panel>
 	<text_editor bottom="28" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"	enabled="false" follows="left|top|right|bottom" height="228" left="5" max_length="2147483647" name="im_history" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="488" word_wrap="true"/>
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="5" follows="left|right" font="SansSerif" height="20" label="Click here to instant message" max_length="2147483647" name="chat_editor" select_all_on_focus_received="false" select_on_focus="false" tab_group="1" width="423" spell_check="true"/>
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 75dc766d0..ff04c9252 100644
--- a/indra/newview/skins/default/xui/en-us/panel_audio.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_audio.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="false" height="100" label="Audio &amp; Video" name="Media panel" width="250">
 	<slider bottom_delta="-15" control_name="AudioLevelMaster" follows="top" height="15" increment="0.005" initial_val="0.5" label="Master" label_width="55" left="10" max_val="1" min_val="0" name="System Volume" show_text="false" volume="true" width="181"/>
-	<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"/>
+	<button bottom_delta="0" control_name="MuteAudio" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" 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="55" left="10" max_val="1" min_val="0" name="Music Volume" show_text="false" volume="true" width="181"/>
-	<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"/>
+	<button bottom_delta="0" control_name="MuteMusic" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" 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="55" left="10" max_val="1" min_val="0" name="Media Volume" show_text="false" volume="true" width="181"/>
-	<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"/>
+	<button bottom_delta="0" control_name="MuteMedia" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" 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="55" left="10" max_val="1" min_val="0" name="Voice Volume" show_text="false" volume="true" width="181"/>
-	<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"/>
+	<button bottom_delta="0" control_name="MuteVoice" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" 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="55" left="10" max_val="1" min_val="0" name="SFX Volume" show_text="false" volume="true" width="181"/>
-	<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"/>
+	<button bottom_delta="0" control_name="MuteSounds" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" 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="55" left="10" max_val="1" min_val="0" name="Wind Volume" show_text="false" volume="true" width="181"/>
-	<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"/>
+	<button bottom_delta="0" control_name="MuteAmbient" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" 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="55" left="10" max_val="1" min_val="0" name="UI Volume" show_text="false" volume="true" width="181"/>
-	<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"/>
+	<button bottom_delta="0" control_name="MuteUI" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" right="-28" label="" name="mute_ui" toggle="true" width="25"/>
 	<button bottom_delta="-18" follows="top" control_name="SinguMuteGestures" font="SansSerifSmall" height="16" label_selected="Unmute Gestures" label_unselected="Mute Gestures" image_selected="inv_item_gesture_muted.tga" image_unselected="inv_item_gesture.tga" scale_image="false" right="-10" left="10" name="Mute gestures" toggle="true" tool_tip="When active, gesture sounds other than your own will not be played for you."/>
-	<button bottom_delta="0" follows="top" control_name="SinguMuteGestures" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" right="-28" label="" toggle="true" width="25"/>
+	<button bottom_delta="0" follows="top" control_name="SinguMuteGestures" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" right="-28" label="" toggle="true" width="25"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en-us/panel_master_volume.xml b/indra/newview/skins/default/xui/en-us/panel_master_volume.xml
index 27bace7ea..45dc3cfa4 100644
--- a/indra/newview/skins/default/xui/en-us/panel_master_volume.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_master_volume.xml
@@ -8,7 +8,7 @@
 	     initial_val="0.5" left_delta="22" max_val="1" min_val="0"
 	     mouse_opaque="true" name="volume_slider"
 	     tool_tip="Change the volume using this slider" width="50" />
-	<button bottom="-20" control_name="MuteAudio" height="20"
+	<button bottom="-20" control_name="MuteAudio" height="20" scale_image="false"
 	     image_selected="icn_speaker-muted_dark.tga"
 	     image_unselected="icn_speaker_dark.tga" label="" left_delta="52"
 	     name="mute_master" toggle="true" width="25" />
diff --git a/indra/newview/skins/default/xui/en-us/panel_media_controls.xml b/indra/newview/skins/default/xui/en-us/panel_media_controls.xml
index a8ecfcab8..d6341631b 100644
--- a/indra/newview/skins/default/xui/en-us/panel_media_controls.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_media_controls.xml
@@ -63,7 +63,7 @@
 	     initial_val="0.5" left_delta="15" max_val="1" min_val="0"
 	     mouse_opaque="true" name="volume_slider" tool_tip="Master Volume"
 	     width="56" />
-	<button bottom="-19" control_name="MuteAudio" height="20"
+	<button bottom="-19" control_name="MuteAudio" height="20" scale_image="false" 
 	     image_selected="icn_speaker-muted_dark.tga"
 	     image_unselected="icn_speaker_dark.tga" label="" left_delta="56"
 	     name="mute_master" toggle="true" tool_tip="Master Mute" width="24" />
diff --git a/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml b/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml
index 9ea1d591f..47a59e536 100644
--- a/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml
@@ -18,7 +18,7 @@
 				<button bottom="-28" enabled="false" follows="left|top" height="20" image_overlay="icon_avatar_offline.tga" label="" left="4" name="profile_btn" right="34" scale_image="true"/>
 				<text bottom_delta="9" follows="left|top|right" left_delta="34" name="resident_name" valign="center" width="140">Rumplstiltskin Califragilistic</text>
 				<volume_slider bottom_delta="-29" follows="left|top" height="15" increment="0.05" initial_val="0.5" left="0" max_val="1.0" min_val="0.0" name="speaker_volume" width="110"/>
-				<button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" left_delta="110" name="mute_btn" tool_tip="Mute voice for this resident" width="25"/>
+				<button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" label="" left_delta="110" name="mute_btn" tool_tip="Mute voice for this resident" width="25"/>
 				<check_box bottom_delta="-25" enabled="false" follows="left|top" height="25" label="Mute Text" left="3" name="mute_text_btn"/>
 			</panel>
 		</layout_panel>