summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLis Linden <lis@lindenlab.com>2010-02-01 16:50:59 -0500
committerLis Linden <lis@lindenlab.com>2010-02-01 16:50:59 -0500
commit5fe9863ff51d52df4a9ab6f6281fd16e6ef029db (patch)
tree6b0993689e46a5c2a39aa411eeae3f0cb0c7263f /indra
parentacc33dfe75f3667f6478bac00c2a634e2605f851 (diff)
parentab2581f6e216f8164b91ba6f9c07eda9d4a50feb (diff)
Automated merge with ssh://lis@hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_sound.xml28
1 files changed, 14 insertions, 14 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index d8e3f4ccfb..02fac36369 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -34,8 +34,8 @@
control_name="MuteAudio"
follows="top|right"
height="18"
- image_selected="Parcel_VoiceNo_Dark"
- image_unselected="Parcel_Voice_Dark"
+ image_selected="AudioMute_Off"
+ image_unselected="Audio_Off"
is_toggle="true"
layout="topleft"
left_pad="16"
@@ -79,8 +79,8 @@
disabled_control="MuteAudio"
follows="top|right"
height="18"
- image_selected="Parcel_VoiceNo_Dark"
- image_unselected="Parcel_Voice_Dark"
+ image_selected="AudioMute_Off"
+ image_unselected="Audio_Off"
is_toggle="true"
layout="topleft"
left_pad="16"
@@ -114,8 +114,8 @@
disabled_control="MuteAudio"
follows="top|right"
height="18"
- image_selected="Parcel_VoiceNo_Dark"
- image_unselected="Parcel_Voice_Dark"
+ image_selected="AudioMute_Off"
+ image_unselected="Audio_Off"
is_toggle="true"
layout="topleft"
left_pad="16"
@@ -149,8 +149,8 @@
disabled_control="MuteAudio"
follows="top|right"
height="18"
- image_selected="Parcel_VoiceNo_Dark"
- image_unselected="Parcel_Voice_Dark"
+ image_selected="AudioMute_Off"
+ image_unselected="Audio_Off"
is_toggle="true"
layout="topleft"
left_pad="16"
@@ -184,8 +184,8 @@
disabled_control="MuteAudio"
follows="top|right"
height="18"
- image_selected="Parcel_VoiceNo_Dark"
- image_unselected="Parcel_Voice_Dark"
+ image_selected="AudioMute_Off"
+ image_unselected="Audio_Off"
is_toggle="true"
layout="topleft"
left_pad="16"
@@ -219,8 +219,8 @@
disabled_control="MuteAudio"
follows="top|right"
height="18"
- image_selected="Parcel_VoiceNo_Dark"
- image_unselected="Parcel_Voice_Dark"
+ image_selected="AudioMute_Off"
+ image_unselected="Audio_Off"
is_toggle="true"
layout="topleft"
left_pad="16"
@@ -270,8 +270,8 @@
disabled_control="MuteAudio"
follows="top|right"
height="18"
- image_selected="Parcel_VoiceNo_Dark"
- image_unselected="Parcel_Voice_Dark"
+ image_selected="AudioMute_Off"
+ image_unselected="Audio_Off"
is_toggle="true"
layout="topleft"
left_pad="16"