From 34f73c8a0b3347fa1eee19393a742415cb6a4e2c Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 25 Aug 2010 09:04:07 -0700
Subject: Tidied up texture picker, added explanatory text

---
 .../xui/en-us/floater_local_asset_browse.xml       |  2 +-
 .../default/xui/en-us/floater_texture_ctrl.xml     | 57 ++++++++++++++--------
 2 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml b/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml
index 3ea7ce4..c63f989 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml
@@ -128,7 +128,7 @@
     height="16"
     visible="false"
  	  >
-    Local UdddUID:
+    Local UUID:
   </text>
 
   <texture_picker
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml b/linden/indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml
index 34cb851..247e0da 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml
@@ -51,7 +51,7 @@
 	     halign="center" height="20" label="Select" label_selected="Select"
 	     left="280" mouse_opaque="true" name="Select" scale_image="true" width="100" />
 	<string name="pick title">
-		Pick:
+		Pick:  
 	</string>
 
   	<tab_container border="false" bottom_delta="0" width="410" height="300" left="175" mouse_opaque="false" name="actions_tab_container" tab_position="top" follows="left|top|right|bottom">
@@ -65,26 +65,41 @@
     </panel>
     <panel border="false" bottom_delta="0" follows="left|top" height="300" label="My Computer" left="175" mouse_opaque="false" name="local_tab" width="410">
   <!-- tag: vaa emerald local_asset_browser [begin] -->
-      <button bottom_delta="-26" enabled="true" follows="left|top" font="SansSerifSmall" halign="center" height="20" label="Add" label_selected="Add" left="4" mouse_opaque="true" name="Add" scale_image="true" width="64" visible="true" />
-      <button bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall" halign="center" height="20" label="Remove" label_selected="Remove" left="72" mouse_opaque="true" name="Remove" scale_image="true" width="64" visible="true" />
-      <button bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall" halign="center" height="20" label="Browser" label_selected="Browser" left="140" mouse_opaque="true" name="Browser" scale_image="true" width="64" visible="true" />
-	  <scroll_list
-	        name="local_name_list"
-	            left="0"
-	            bottom="-255"
-	            width="271"
-	            height="225"
-	        follows="left|top|right|bottom"
-	        column_padding="0"
-	        can_resize="false"
-	        draw_heading="true"
-	        multi_select="true"
-	        search_column="1"
-	            visible="true"
-		  	  >
-	    <column name="unit_name" label="Name" dynamicwidth="true" />
-	    <column name="unit_id_HIDDEN" label="ID" width="0" />
-	  </scroll_list>
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+           bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+           font="SansSerifSmall" h_pad="0" halign="left" height="14" left="4"
+           mouse_opaque="true" name="select_local" v_pad="0" width="400">
+        Select texture on your computer to preview inworld
+      </text>
+      <button bottom_delta="-22" enabled="true" follows="left|top" 
+              font="SansSerifSmall" halign="center" height="20" 
+              label="Add" left="4" mouse_opaque="true" 
+              name="Add" scale_image="true" width="70" visible="true" />
+      <button bottom_delta="0" enabled="true" follows="left|top" 
+              font="SansSerifSmall" halign="center" height="20" 
+              label="Remove" left_delta="73" mouse_opaque="true" 
+              name="Remove" scale_image="true" width="70" visible="true" />
+      <button bottom_delta="0" enabled="true" follows="left|top" 
+              font="SansSerifSmall" halign="center" height="20" 
+              label="More Info" left_delta="103" mouse_opaque="true" 
+              name="Browser" scale_image="true" width="90" visible="true" />
+      <scroll_list
+              name="local_name_list"
+              left="0"
+              bottom="-270"
+              width="271"
+              height="225"
+              follows="left|top|right|bottom"
+              column_padding="0"
+              can_resize="false"
+              draw_heading="true"
+              multi_select="true"
+              search_column="1"
+              visible="true"
+	  	        >
+	      <column name="unit_name" label="Name" dynamicwidth="true" />
+	      <column name="unit_id_HIDDEN" label="ID" width="0" />
+	    </scroll_list>
 	  <!-- tag: vaa emerald local_asset_browser [end] -->
     </panel>
   </tab_container>
-- 
cgit v1.1