diff options
| author | angela <angela@lindenlab.com> | 2010-02-23 11:30:12 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-02-23 11:30:12 +0800 |
| commit | 0eea585ef13426bf343fb5bcc3642cdfc769c022 (patch) | |
| tree | 6055dcbd0433762730ed7ef52883f5ee9b21f8f7 /indra/newview/skins/default/xui | |
| parent | 98a0c11da9e1c7ee8351cb9ab6d9cd5345a4e002 (diff) | |
revert some changed from EXT-5410 but keep the changes for disabling streaming audio when music or media is disabled. reviewed by rick
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_nearby_media.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_sound.xml | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml index f3dfd56fbe..0f911f789e 100644 --- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml @@ -14,9 +14,7 @@ <string name="media_item_count_format">(%ld media items)</string> <string name="empty_item_text"><empty></string> <string name="parcel_media_name">Parcel Streaming Media</string> - <string name="parcel_media_name_disabled">Parcel Streaming Media (Disabled)</string> <string name="parcel_audio_name">Parcel Streaming Audio</string> - <string name="parcel_audio_name_disabled">Parcel Streaming Audio (Disabled)</string> <string name="playing_suffix">(playing)</string> <panel bevel_style="in" 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 8fa7f75f6b..a7cdd241c5 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml @@ -38,7 +38,7 @@ image_unselected="Audio_Off" is_toggle="true" layout="topleft" - left_pad="5" + left_pad="5" name="mute_audio" tab_stop="false" width="16" /> @@ -49,7 +49,7 @@ label="Mute when minimized" layout="topleft" name="mute_when_minimized" - top_delta="3" + top_delta="3" left_pad="5" width="215" /> <slider @@ -177,14 +177,14 @@ </slider> <button control_name="MuteMusic" - disabled_control="MuteAudio" + disabled_control="MuteAudio" follows="top|left" height="16" image_selected="AudioMute_Off" image_unselected="Audio_Off" is_toggle="true" layout="topleft" - left_pad="5" + left_pad="5" name="mute_audio" tab_stop="false" width="16" /> @@ -326,8 +326,8 @@ length="1" follows="left|top" layout="topleft" - left="80" - top_delta="16" + left="80" + top_delta="16" name="Listen from" width="80"> Listen from: @@ -521,7 +521,7 @@ visible="true" width="22" /> <text - font.style="BOLD" + font.style="BOLD" type="string" length="1" follows="left|top" |