From c35801ef1c56b6c84063f47b490a8d2220b77ca7 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 5 Nov 2013 19:26:23 -0800
Subject: fixed focus issue on inventory

---
 indra/newview/skins/default/textures/textures.xml  |  10 +-
 .../textures/widgets/horizontal_drag_handle.png    | Bin 197 -> 217 bytes
 .../textures/widgets/vertical_drag_handle.png      | Bin 196 -> 238 bytes
 .../skins/default/xui/en/panel_main_inventory.xml  |   2 -
 .../skins/default/xui/en/sidepanel_inventory.xml   | 105 ++++++++++-----------
 .../skins/default/xui/en/widgets/avatar_icon.xml   |  12 ++-
 6 files changed, 63 insertions(+), 66 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 54f60f4441..ff0a692741 100755
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -29,7 +29,7 @@ with the same filename but different name
 -->
 
 <textures version="101">
-  <!-- Please add new files alphabetically to prevent merge conflicts. JC -->
+	<!-- Please add new files alphabetically to prevent merge conflicts. JC -->
   <texture name="Accordion_ArrowClosed_Off" file_name="containers/Accordion_ArrowClosed_Off.png" preload="false" />
   <texture name="Accordion_ArrowClosed_Press" file_name="containers/Accordion_ArrowClosed_Press.png" preload="false" />
   <texture name="Accordion_ArrowOpened_Off" file_name="containers/Accordion_ArrowOpened_Off.png" preload="false" />
@@ -231,8 +231,9 @@ with the same filename but different name
 
 
   <texture name="Home_Off" file_name="navbar/Home_Off.png" preload="false" />
+	<texture name="Horizontal Drag Handle" file_name="widgets/horizontal_drag_handle.png" scale.left="8" scale.right="120" scale.bottom="1" scale.top="6" scale_type="scale_outer"/>
 
-  <texture name="Icon_Close_Foreground" file_name="windows/Icon_Close_Foreground.png" preload="true" />
+	<texture name="Icon_Close_Foreground" file_name="windows/Icon_Close_Foreground.png" preload="true" />
   <texture name="Icon_Close_Press" file_name="windows/Icon_Close_Press.png" preload="true" />
   <texture name="Icon_Close_Toast" file_name="windows/Icon_Close_Toast.png" preload="true" />
 
@@ -646,8 +647,9 @@ with the same filename but different name
   <texture name="Unread_Chiclet" file_name="bottomtray/Unread_Chiclet.png" preload="false" />
 
   <texture name="UpArrow_Off" file_name="icons/UpArrow_Off.png" preload="false" />
+	<texture name="Vertical Drag Handle" file_name="widgets/vertical_drag_handle.png" scale.left="2" scale.right="7" scale.bottom="8" scale.top="120"  scale_type="scale_outer"/>
 
-    <texture name="Volume_Background" file_name="windows/Volume_Background.png" preload="false"
+	<texture name="Volume_Background" file_name="windows/Volume_Background.png" preload="false"
            scale.left="6" scale.top="33" scale.right="63" scale.bottom="10" />
 
   <texture name="VoicePTT_Lvl1" file_name="bottomtray/VoicePTT_Lvl1.png" preload="false" />
@@ -775,6 +777,4 @@ with the same filename but different name
   <texture name="Camera_Drag_Dot" file_name="world/CameraDragDot.png"/>
   <texture name="NavBar Separator" file_name="navbar/separator.png"/>
 
-  <texture name="Horizontal Drag Handle" file_name="widgets/horizontal_drag_handle.png"/>
-  <texture name="Vertical Drag Handle" file_name="widgets/vertical_drag_handle.png"/>
 </textures>
diff --git a/indra/newview/skins/default/textures/widgets/horizontal_drag_handle.png b/indra/newview/skins/default/textures/widgets/horizontal_drag_handle.png
index 642eac4065..5f5a33be42 100644
Binary files a/indra/newview/skins/default/textures/widgets/horizontal_drag_handle.png and b/indra/newview/skins/default/textures/widgets/horizontal_drag_handle.png differ
diff --git a/indra/newview/skins/default/textures/widgets/vertical_drag_handle.png b/indra/newview/skins/default/textures/widgets/vertical_drag_handle.png
index b06b70cf36..2ce5208c21 100644
Binary files a/indra/newview/skins/default/textures/widgets/vertical_drag_handle.png and b/indra/newview/skins/default/textures/widgets/vertical_drag_handle.png differ
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 1c882bb099..0518688f45 100755
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- default_tab_group="1"
  follows="all"
  height="423"
  label="Things"
@@ -57,7 +56,6 @@
      left="7"
      name="inventory filter tabs"
      tab_height="30"
-     tab_group="1"
      tab_position="top"
      tab_min_width="100"
      top_pad="10"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 14bd349480..d3e24a19ef 100755
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -12,17 +12,19 @@
 		 follows="all"
 		 layout="topleft"
 		 left="0"
-		 name="sidepanel__inventory_panel"
+		 name="sidepanel_inventory_panel"
 		 top="0"
 		 label=""
 		 height="570"
 		 visible="true"
+		 default_tab_group="1"
 		 width="330">
-         <layout_stack
+      <layout_stack
               follows="left|right|top|bottom"
               layout="topleft"
               left="0"
               top="0"
+							tab_group="1"
               orientation="vertical"
               name="inventory_layout_stack"
               height="535"
@@ -75,7 +77,7 @@
                      <button
                         control_name="InventoryInboxToggleState"
                         label="Received items"
-						font="SansSerifMedium"
+												font="SansSerifMedium"
                         name="inbox_btn"
                         height="35"
                         width="308"
@@ -116,61 +118,56 @@
                         background_opaque="true"
                         tool_tip="Drag and drop items to your inventory to use them"
                         >
-                        <text
-							name="inbox_inventory_placeholder"
-							type="string"
-							follows="all"
-							layout="topleft"
-							top="0"
-							left="0"
-							width="308"
-							height="200"
-							wrap="true"
-							halign="center">
-							Purchases from the marketplace will be delivered here.
-						</text>
+                        <text name="inbox_inventory_placeholder"
+															type="string"
+															follows="all"
+															layout="topleft"
+															top="0"
+															left="0"
+															width="308"
+															height="200"
+															wrap="true"
+															halign="center">
+Purchases from the marketplace will be delivered here.
+												</text>
                     </panel>
                  </panel>
              </layout_panel>
          </layout_stack>
-		<panel
-		     follows="bottom|left|right"
-			 height="30"
-			 layout="topleft"
-			 name="button_panel"
-			 left="9"
-             top_pad="7"
-			 width="308">
-			<layout_stack
-     	         follows="bottom|left|right"
-		         height="23"
-		         layout="topleft"
-		         mouse_opaque="false"
-		         name="button_panel_ls"
-		         left="0"
-		         orientation="horizontal"
-		         top="0"
-		         width="308">	
-			    <layout_panel
-			         follows="bottom|left|right"
-			         height="23"
-                     layout="bottomleft"
-                     left="0"			
-                     mouse_opaque="false"
-                     name="info_btn_lp"
-                     auto_resize="true"
-                     width="101">
-                    <button
-                         enabled="true"
-                         follows="bottom|left|right"
-                         height="23"
-                         label="Profile"
-                         layout="topleft"
-                         left="1"
-                         name="info_btn"
-                         tool_tip="Show object profile"
-                         top="0"
-                         width="100" />
+			<panel follows="bottom|left|right"
+					 height="30"
+					 layout="topleft"
+					 name="button_panel"
+					 left="9"
+					 top_pad="7"
+					 width="308">
+				<layout_stack follows="bottom|left|right"
+											height="23"
+											layout="topleft"
+											mouse_opaque="false"
+											name="button_panel_ls"
+											left="0"
+											orientation="horizontal"
+											top="0"
+											width="308">	
+			    <layout_panel follows="bottom|left|right"
+												height="23"
+												layout="bottomleft"
+												left="0"			
+												mouse_opaque="false"
+												name="info_btn_lp"
+												auto_resize="true"
+												width="101">
+						<button enabled="true"
+										follows="bottom|left|right"
+										height="23"
+										label="Profile"
+										layout="topleft"
+										left="1"
+										name="info_btn"
+										tool_tip="Show object profile"
+										top="0"
+										width="100" />
 			    </layout_panel>
 			    <layout_panel
                      follows="bottom|left|right"
diff --git a/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml b/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml
index 4d69dda7eb..7f8fac04d0 100755
--- a/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml
+++ b/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 
-<avatar_icon
-    name="avatar_icon"
-    default_icon_name="Generic_Person_Large"
-    use_draw_context_alpha="false">
-</avatar_icon>
+<avatar_icon name="avatar_icon"
+						 default_icon_name="Generic_Person_Large"
+						 use_draw_context_alpha="false"
+						 symbol_hpad = "2"
+						 symbol_vpad = "1"
+						 symbol_size = "5"/>
+
-- 
cgit v1.2.3