From 8cf7dad209fd97c1ab822ef183e8a74faceeb3d8 Mon Sep 17 00:00:00 2001
From: Rick Pasetto <rick@lindenlab.com>
Date: Tue, 23 Feb 2010 17:36:25 -0800
Subject: =?UTF-8?q?FIX=20EXT-5680:=20Get=20rid=20of=20unnecessary=20code?=
 =?UTF-8?q?=20that=20formats=20the=20media=20item=20count=20Review=20#139?=
 =?UTF-8?q?=20The=20crash=20was=20happening=20because=20the=20German=20(lo?=
 =?UTF-8?q?cale=20"de")=20version=20of=20the=20format=20string=20had=20an?=
 =?UTF-8?q?=20=E2=80=8B%ls=20in=20it,=20which=20was=20causing=20the=20cras?=
 =?UTF-8?q?h.=20Getting=20rid=20of=20the=20widget=20and=20the=20string=20s?=
 =?UTF-8?q?ince=20it=20is=20no=20longer=20desired=20in=20the=20design.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../skins/default/xui/de/panel_nearby_media.xml    |  3 ---
 .../skins/default/xui/en/panel_nearby_media.xml    | 23 ++++------------------
 .../skins/default/xui/fr/panel_nearby_media.xml    |  3 ---
 .../skins/default/xui/ja/panel_nearby_media.xml    |  3 ---
 4 files changed, 4 insertions(+), 28 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/de/panel_nearby_media.xml b/indra/newview/skins/default/xui/de/panel_nearby_media.xml
index ec2ad42fa1..2d97a25fa9 100644
--- a/indra/newview/skins/default/xui/de/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/de/panel_nearby_media.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="nearby_media">
-	<string name="media_item_count_format">
-		(%ls Medien-Objekte)
-	</string>
 	<string name="empty_item_text">
 		&lt;leer&gt;
 	</string>
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..aba1589eae 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
@@ -2,23 +2,22 @@
 <panel
 	can_resize="true"
 	can_close="false"
- bg_opaque_image="Volume_Background" 
- bg_alpha_image="Volume_Background" 
-  background_opaque="true"
+	bg_opaque_image="Volume_Background" 
+	bg_alpha_image="Volume_Background" 
+	background_opaque="true"
 	background_visible="true"
 	layout="topleft"
 	width="270"
 	height="235"
 	name="nearby_media"
 	help_topic="nearby_media">
-  <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_audio_name">Parcel Streaming Audio</string>
   <string name="playing_suffix">(playing)</string>
   <panel
 	  bevel_style="in"
-    background_visible="false" 
+	  background_visible="false" 
 	  follows="left|right|top"
 	  top="0"
 	  height="30"
@@ -98,20 +97,6 @@
 		width="100">
 	  Nearby Media
 	</text>
-	<!-- nix for now
-		 <text
-		 bottom_delta="1"
-		 type="string"
-		 follows="top|left|right"
-		 font="SansSerif"
-		 font.style="ITALIC"
-		 font.size="Small"
-		 name="media_item_count"
-		 left="115"
-		 right="-10">
-		 (?? media items)
-		 </text>
-	-->
 	<text
 		type="string"
 		length="1"
diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml
index 53b9bc6f82..71e65232aa 100644
--- a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="nearby_media">
-	<string name="media_item_count_format">
-		(%ld articles de média)
-	</string>
 	<string name="empty_item_text">
 		&lt;vide&gt;
 	</string>
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
index ca93d46e4d..a670975dda 100644
--- a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="nearby_media">
-	<string name="media_item_count_format">
-		（メディアアイテム %ld ）
-	</string>
 	<string name="empty_item_text">
 		&lt;空&gt;
 	</string>
-- 
cgit v1.2.3


From 262f34b25dbdde7940ef28ff02058f4ef12d92f1 Mon Sep 17 00:00:00 2001
From: Rick Pasetto <rick@lindenlab.com>
Date: Tue, 23 Feb 2010 18:13:50 -0800
Subject: FIX EXT-5517: clear hover face when cursor hovers over Nearby Media
 panel Review #140 This isn't the most generalized solution, but it fixes the
 proximal problem of selecting items in the Nearby Media panel, and is low
 risk because the code change is isolated to that panel.

---
 indra/newview/skins/default/xui/en/panel_nearby_media.xml | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'indra/newview/skins')

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 aba1589eae..7c0ce9e62e 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
@@ -2,6 +2,7 @@
 <panel
 	can_resize="true"
 	can_close="false"
+	mouse_opaque="true"
 	bg_opaque_image="Volume_Background" 
 	bg_alpha_image="Volume_Background" 
 	background_opaque="true"
@@ -132,6 +133,7 @@
 		  ame="OnOthers" />
 	</combo_box>
 	<scroll_list
+		name="media_list"
 		follows="left|top|bottom|right"
 		column_padding="0"
 		height="105"
@@ -140,8 +142,7 @@
 		bg_stripe_color="0.25 0.25 0.25 0.25"
 		top_pad="8"
 		left="10"
-		right="-10"
-		name="media_list">
+		right="-10">
 	  <scroll_list.columns
 		  type="checkbox"
 		  width="-1"
@@ -189,11 +190,9 @@
 		  left="10"
 		  right="-10"
 		  border_size="0"
-		  mouse_opaque="false"
 		  orientation="horizontal">
 		<layout_panel
 			name="stop"
-			mouse_opaque="false"
 			auto_resize="false"
 			user_resize="false"
 			layout="topleft"
@@ -221,7 +220,6 @@
 		</layout_panel>
 		<layout_panel
 			name="play"
-			mouse_opaque="false"
 			auto_resize="false"
 			user_resize="false"
 			layout="topleft"
@@ -249,7 +247,6 @@
 		</layout_panel>
 		<layout_panel
 			name="pause"
-			mouse_opaque="false"
 			auto_resize="false"
 			user_resize="false"
 			layout="topleft"
@@ -276,7 +273,6 @@
 		</layout_panel>
 		<layout_panel
 			name="volume_slider_ctrl"
-			mouse_opaque="false"
 			auto_resize="true"
 			user_resize="false"
 			follows="left|right"
@@ -301,7 +297,6 @@
 		</layout_panel>
 		<layout_panel
 			name="mute"
-			mouse_opaque="false"
 			auto_resize="false"
 			user_resize="false"
 			layout="topleft"
@@ -330,7 +325,6 @@
 		</layout_panel>
 		<layout_panel
 			name="zoom"
-			mouse_opaque="false"
 			auto_resize="false"
 			user_resize="false"
 			layout="topleft"
@@ -358,7 +352,6 @@
 		</layout_panel>
 		<layout_panel
 			name="unzoom"
-			mouse_opaque="false"
 			auto_resize="false"
 			user_resize="false"
 			layout="topleft"
@@ -387,7 +380,6 @@
 		<layout_panel
 			name="right_bookend"
 			width="0"
-			mouse_opaque="false"
 			user_resize="false" />
 	  </layout_stack>
 	</panel>
-- 
cgit v1.2.3