From 98a0c11da9e1c7ee8351cb9ab6d9cd5345a4e002 Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Mon, 22 Feb 2010 17:34:28 +0800
Subject: EXT-5410 Streaming audio does ignores preference setting.

---
 indra/newview/skins/default/xui/en/panel_nearby_media.xml      | 2 ++
 indra/newview/skins/default/xui/en/panel_preferences_sound.xml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

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 0f911f789e..f3dfd56fbe 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
@@ -14,7 +14,9 @@
   <string name="media_item_count_format">(%ld media items)</string>
   <string name="empty_item_text">&lt;empty&gt;</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 c9752cf913..8fa7f75f6b 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -17,7 +17,7 @@
      increment="0.05"
      initial_value="0.5"
      label="Master volume"
-	 label_width="120"
+	   label_width="120"
      layout="topleft"
      left="0"
      name="System Volume"
-- 
cgit v1.2.3