From a10eb7b240675b009430f6718d410399d8045581 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 5 Nov 2013 19:30:38 -0800
Subject: further fix of inventory keyboard focus and tab order calculations

---
 .../skins/default/xui/da/sidepanel_inventory.xml   |   2 +-
 .../skins/default/xui/de/sidepanel_inventory.xml   |   2 +-
 .../xui/en/floater_conversation_preview.xml        |   1 -
 .../skins/default/xui/en/floater_im_session.xml    |   2 -
 .../skins/default/xui/en/floater_toybox.xml        |   1 -
 .../skins/default/xui/en/panel_bottomtray_lite.xml |   1 -
 .../skins/default/xui/en/panel_nearby_chat_bar.xml |   1 -
 .../skins/default/xui/en/panel_outfit_edit.xml     | 963 ++++++++++-----------
 .../newview/skins/default/xui/en/panel_people.xml  |   2 -
 .../skins/default/xui/es/sidepanel_inventory.xml   |   2 +-
 .../skins/default/xui/fr/sidepanel_inventory.xml   |   2 +-
 .../skins/default/xui/it/sidepanel_inventory.xml   |   2 +-
 .../skins/default/xui/ja/sidepanel_inventory.xml   |   2 +-
 .../skins/default/xui/pl/sidepanel_inventory.xml   |   2 +-
 .../skins/default/xui/pt/sidepanel_inventory.xml   |   2 +-
 .../skins/default/xui/ru/sidepanel_inventory.xml   |   2 +-
 .../skins/default/xui/tr/sidepanel_inventory.xml   |   2 +-
 .../skins/default/xui/zh/sidepanel_inventory.xml   |   2 +-
 18 files changed, 488 insertions(+), 505 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/da/sidepanel_inventory.xml b/indra/newview/skins/default/xui/da/sidepanel_inventory.xml
index b3293b981e..b4b494cafa 100755
--- a/indra/newview/skins/default/xui/da/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/da/sidepanel_inventory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Ting" name="objects panel">
-	<panel label="" name="sidepanel__inventory_panel">
+	<panel label="" name="sidepanel_inventory_panel">
 		<panel name="button_panel">
 			<layout_stack name="button_panel_ls">
 				<layout_panel name="info_btn_lp">
diff --git a/indra/newview/skins/default/xui/de/sidepanel_inventory.xml b/indra/newview/skins/default/xui/de/sidepanel_inventory.xml
index 18aad64f96..2585c5dc90 100755
--- a/indra/newview/skins/default/xui/de/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/de/sidepanel_inventory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Sonstiges" name="objects panel">
-	<panel label="" name="sidepanel__inventory_panel">
+	<panel label="" name="sidepanel_inventory_panel">
 		<layout_stack name="inventory_layout_stack">
 			<layout_panel name="inbox_layout_panel">
 				<panel label="" name="marketplace_inbox">
diff --git a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
index 764b9d8385..99ad59a7a3 100755
--- a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
@@ -2,7 +2,6 @@
 <floater
  legacy_header_height="18"
  can_resize="true"
- default_tab_group="1"
  help_topic="conversation_preview"
  height="391"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 43d0f2fb18..468f05d492 100755
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  background_visible="true"
- default_tab_group="1"
  height="355"
  help_topic="floater_im_box"
  layout="topleft"
@@ -213,7 +212,6 @@
                      min_width="172">
                         <layout_stack
                          animate="true" 
-                         default_tab_group="2"
                          follows="all"
                          orientation="vertical"
                          name="translate_and_chat_stack"
diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml
index d8211c24a7..bc19d6e79f 100755
--- a/indra/newview/skins/default/xui/en/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/en/floater_toybox.xml
@@ -4,7 +4,6 @@
   can_dock="false"
   can_minimize="false"
   can_resize="false"
-  default_tab_group="1"
   height="375"
   help_topic="toybox"
   layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml
index 27a27473d8..1c0b205c4f 100755
--- a/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- default_tab_group="2"
  mouse_opaque="true"
  background_visible="true"
  bg_alpha_color="DkGray"
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
index 19143cef89..1e43db08f7 100755
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- default_tab_group="1"
  follows="left|bottom|right"
  height="25"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index b61f110e32..3f13cea58e 100755
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -12,32 +12,32 @@
  name="outfit_edit"
  top="0"
  width="320">
-    <string
-     name="No Outfit"
-     value="No Outfit"/>
-    <string
-     name="unsaved_changes"
-     value="Unsaved Changes"/>
-    <string
-     name="now_editing"
-     value="Now Editing"/>
-    <string
-     name="folder_view_off"
-     value="Hierarchy_View_Disabled"
-     translate="false"/>
-    <string
-     name="folder_view_on"
-     value="Hierarchy_View_On"
-     translate="false"/>
-    <string
-     name="list_view_off"
-     value="List_View_Disabled"
-     translate="false"/>
-    <string
-     name="list_view_on"
-     value="List_View_On"
-     translate="false"/>
-	
+	<string
+	 name="No Outfit"
+	 value="No Outfit"/>
+	<string
+	 name="unsaved_changes"
+	 value="Unsaved Changes"/>
+	<string
+	 name="now_editing"
+	 value="Now Editing"/>
+	<string
+	 name="folder_view_off"
+	 value="Hierarchy_View_Disabled"
+	 translate="false"/>
+	<string
+	 name="folder_view_on"
+	 value="Hierarchy_View_On"
+	 translate="false"/>
+	<string
+	 name="list_view_off"
+	 value="List_View_Disabled"
+	 translate="false"/>
+	<string
+	 name="list_view_on"
+	 value="List_View_On"
+	 translate="false"/>
+
 	<panel.string
 		name="not_available">
 		(N\A)
@@ -47,475 +47,466 @@
 		(unknown)
 	</panel.string>
 
-    <!-- Wearables filtering strings -->
-    <string name="Filter.All" value="All"/>
-    <string name="Filter.Clothes/Body" value="Clothes/Body"/>
-    <string name="Filter.Objects" value="Objects"/>
-    <string name="Filter.Clothing" value="Clothing"/>
-    <string name="Filter.Bodyparts" value="Body parts"/>
+	<!-- Wearables filtering strings -->
+	<string name="Filter.All" value="All"/>
+	<string name="Filter.Clothes/Body" value="Clothes/Body"/>
+	<string name="Filter.Objects" value="Objects"/>
+	<string name="Filter.Clothing" value="Clothing"/>
+	<string name="Filter.Bodyparts" value="Body parts"/>
+
+	<string
+	 name="replace_body_part"
+	 value="Click to replace your existing shape"/>
 
-    <string
-     name="replace_body_part"
-     value="Click to replace your existing shape"/>
-  
 
-    <button
-     follows="top|left"
-     height="24"
-     image_hover_unselected="BackButton_Over"
-     image_pressed="BackButton_Press"
-     image_unselected="BackButton_Off"
-     layout="topleft"
-     name="back_btn"
-     left="5"
-     tab_stop="false"
-     top="1"
-     width="30"
-     use_draw_context_alpha="false" />
-    <text
-     follows="top|left|right"
-     font="SansSerifHugeBold"
-     height="26"
-     layout="topleft"
-     left_pad="10"
-     name="title"
-     text_color="LtGray"
-     top="0"
-     value="Edit Outfit"
-     use_ellipses="true"
-     width="275" /> 
+	<button
+	 follows="top|left"
+	 height="24"
+	 image_hover_unselected="BackButton_Over"
+	 image_pressed="BackButton_Press"
+	 image_unselected="BackButton_Off"
+	 layout="topleft"
+	 name="back_btn"
+	 left="5"
+	 tab_stop="false"
+	 top="1"
+	 width="30"
+	 use_draw_context_alpha="false" />
+	<text
+	 follows="top|left|right"
+	 font="SansSerifHugeBold"
+	 height="26"
+	 layout="topleft"
+	 left_pad="10"
+	 name="title"
+	 text_color="LtGray"
+	 top="0"
+	 value="Edit Outfit"
+	 use_ellipses="true"
+	 width="275" />
 
-<!-- "HEADER WITH ICON, STATUS TEXT AND OUTFIT NAME" -->
-    <panel
-     background_visible="true"
-     bg_alpha_color="DkGray2"
-     bevel_style="none"
-     follows="top|left|right"
-     height="40"
-     layout="topleft"
-     left="6"
-     name="header_panel"
-     top_pad="5" 
-     width="311">
-        <icon
-         follows="left|top"
-         height="31"
-         image_name="Shirt_Large"
-         left="2"
-         mouse_opaque="false"
-         name="outfit_icon"
-         top="2"
-         scale_image="true"
-         visible="true"
-         width="31" />
-            <panel
-             bevel_style="none"
-             follows="top|left|right"
-             height="37"
-             layout="topleft"
-             left_pad="5"
-             name="outfit_name_and_status"
-             top="2"
-             width="270">
-                <text
-                 follows="top|left|right"
-                 font="SansSerifSmallBold"
-                 height="13"
-                 layout="topleft"
-                 name="status"
-                 text_color="EmphasisColor"
-                 top="2"
-                 value="Now editing..."
-                 use_ellipses="true"
-                 width="245" /> 
-                <text
-                 follows="bottom|left|right"
-                 font="SansSerifLargeBold"
-                 height="18"
-                 layout="topleft"
-                 name="curr_outfit_name"
-                 parse_urls="false"
-                 text_color="LtGray"
-                 top_pad="2"
-                 value="[Current Outfit]"
-                 use_ellipses="true"
-                 width="245" /> 
-                <loading_indicator
-                 follows="right|top"
-                 height="24"
-                 layout="topleft"
-                 right="-2"
-                 name="edit_outfit_loading_indicator"
-                 top="6"
-                 width="24" />
-            </panel>
-    </panel>
+	<!-- "HEADER WITH ICON, STATUS TEXT AND OUTFIT NAME" -->
+	<panel
+	 background_visible="true"
+	 bg_alpha_color="DkGray2"
+	 bevel_style="none"
+	 follows="top|left|right"
+	 height="40"
+	 layout="topleft"
+	 left="6"
+	 name="header_panel"
+	 top_pad="5"
+	 width="311">
+		<icon
+		 follows="left|top"
+		 height="31"
+		 image_name="Shirt_Large"
+		 left="2"
+		 mouse_opaque="false"
+		 name="outfit_icon"
+		 top="2"
+		 scale_image="true"
+		 visible="true"
+		 width="31" />
+		<panel
+		 bevel_style="none"
+		 follows="top|left|right"
+		 height="37"
+		 layout="topleft"
+		 left_pad="5"
+		 name="outfit_name_and_status"
+		 top="2"
+		 width="270">
+			<text
+			 follows="top|left|right"
+			 font="SansSerifSmallBold"
+			 height="13"
+			 layout="topleft"
+			 name="status"
+			 text_color="EmphasisColor"
+			 top="2"
+			 value="Now editing..."
+			 use_ellipses="true"
+			 width="245" />
+			<text
+			 follows="bottom|left|right"
+			 font="SansSerifLargeBold"
+			 height="18"
+			 layout="topleft"
+			 name="curr_outfit_name"
+			 parse_urls="false"
+			 text_color="LtGray"
+			 top_pad="2"
+			 value="[Current Outfit]"
+			 use_ellipses="true"
+			 width="245" />
+			<loading_indicator
+			 follows="right|top"
+			 height="24"
+			 layout="topleft"
+			 right="-2"
+			 name="edit_outfit_loading_indicator"
+			 top="6"
+			 width="24" />
+		</panel>
+	</panel>
 
 
-<!-- LIST OF WEARABLES (CURRENT OUTFIT/ WEARABLES TO ADD) -->
-<!-- *NOTE: border_size is used to calculate space between layout panels and also to calculate resize bar's height.
+	<!-- LIST OF WEARABLES (CURRENT OUTFIT/ WEARABLES TO ADD) -->
+	<!-- *NOTE: border_size is used to calculate space between layout panels and also to calculate resize bar's height.
 Required height for dragbar (icon in spec) is 10, so resizebar height should be 10 px.
 It is calculated as border_size + 2*UIResizeBarOverlap
 -->
-    <layout_stack
-     animate="true"
-     border_size="8"
-     clip="false"
-     default_tab_group="2"
-     follows="all"
-     height="465"
-     width="313"
-     layout="topleft"
-     orientation="vertical"
-     name="im_panels"
-     tab_group="1"
-     top_pad="5"
-     left="5">
-        <layout_panel
-         layout="topleft"
-         height="187"
-         min_height="155"
-         name="outfit_wearables_panel"
-         width="313"
-         auto_resize="true"
-         user_resize="true">
+	<layout_stack
+	 animate="true"
+	 border_size="8"
+	 clip="false"
+	 default_tab_group="2"
+	 follows="all"
+	 height="465"
+	 width="313"
+	 layout="topleft"
+	 orientation="vertical"
+	 name="im_panels"
+	 tab_group="1"
+	 top_pad="5"
+	 left="5">
+		<layout_panel
+		 layout="topleft"
+		 height="187"
+		 min_height="155"
+		 name="outfit_wearables_panel"
+		 width="313"
+		 auto_resize="true"
+		 user_resize="true">
 
-            <layout_stack
-             animate="true"
-             border_size="0"
-             follows="all"
-             height="185"
-             width="313"
-             orientation="vertical" 
-             layout="topleft"
-             name="filter_panels"
-             top="0"
-             left="0">
-                <layout_panel
-                 auto_resize="true" 
-                 background_visible="false"
-                 layout="topleft"
-                 height="154"
-                 name="add_button_and_combobox"
-                 width="311"
-                 visible="true">
+			<layout_stack
+			 animate="true"
+			 border_size="0"
+			 follows="all"
+			 height="185"
+			 width="313"
+			 orientation="vertical"
+			 layout="topleft"
+			 name="filter_panels"
+			 top="0"
+			 left="0">
+				<layout_panel
+				 auto_resize="true"
+				 background_visible="false"
+				 layout="topleft"
+				 height="154"
+				 name="add_button_and_combobox"
+				 width="311"
+				 visible="true">
 
-            <!-- List containing items from the COF and Base outfit -->
-            <panel
-             background_visible="false"
-             class="cof_wearables"
-             filename="panel_cof_wearables.xml"
-                     follows="all" 
-                     height="129"
-             layout="topleft"
-             left="1"
-             name="cof_wearables_list"
-             top="0"
-             width="311" />
+					<!-- List containing items from the COF and Base outfit -->
+					<panel
+					 background_visible="false"
+					 class="cof_wearables"
+					 filename="panel_cof_wearables.xml"
+									 follows="all"
+									 height="129"
+					 layout="topleft"
+					 left="1"
+					 name="cof_wearables_list"
+					 top="0"
+					 width="311" />
 
-                    <button
-                     follows="left|bottom" 
-                     height="22"
-                     image_pressed="PushButton_Press"
-                     image_pressed_selected="PushButton_Selected_Press"
-                     image_selected="PushButton_Selected_Press"
-                     is_toggle="true"
-                     label="Add More..."
-                     layout="topleft"
-                     left="2"
-                     name="show_add_wearables_btn"
-                     top_pad="2"
-                     tool_tip="Open/Close"
-                     width="125" />
+					<button
+					 follows="left|bottom"
+					 height="22"
+					 image_pressed="PushButton_Press"
+					 image_pressed_selected="PushButton_Selected_Press"
+					 image_selected="PushButton_Selected_Press"
+					 is_toggle="true"
+					 label="Add More..."
+					 layout="topleft"
+					 left="2"
+					 name="show_add_wearables_btn"
+					 top_pad="2"
+					 tool_tip="Open/Close"
+					 width="125" />
 
-                    <combo_box
-                     follows="left|right|bottom"
-                     height="22"
-             layout="topleft"
-                     left_pad="5"
-                     name="list_view_filter_combobox"
-                     top_delta="0"
-                     visible="false"
-                     width="152"/>
-                    <combo_box
-                     follows="left|right|bottom"
-                     height="22"
-                     layout="topleft"
-                     left_delta="0"
-                     name="folder_view_filter_combobox"
-                     top_delta="0"
-                     visible="false"
-                     width="152"/>
-                    
-            <button
-                     follows="bottom|right"
-                     height="22"
-             image_overlay="Search_Icon"
-                     image_pressed="PushButton_Press"
-                     image_pressed_selected="PushButton_Selected_Press"
-                     image_selected="PushButton_Selected_Press"
-             is_toggle="true"
-             layout="topleft"
-             name="filter_button"
-                     right="-5"
-             top_delta="0"
-                     visible="false"
-             width="20" />
-                </layout_panel>
+					<combo_box
+					 follows="left|right|bottom"
+					 height="22"
+	 layout="topleft"
+					 left_pad="5"
+					 name="list_view_filter_combobox"
+					 top_delta="0"
+					 visible="false"
+					 width="152"/>
+					<combo_box
+					 follows="left|right|bottom"
+					 height="22"
+					 layout="topleft"
+					 left_delta="0"
+					 name="folder_view_filter_combobox"
+					 top_delta="0"
+					 visible="false"
+					 width="152"/>
 
-                <layout_panel
-                 auto_resize="false"
-                 background_visible="true"
-                 bg_alpha_color="DkGray2"
-                 height="30"
-                 name="filter_panel"
-                 width="311"
-                 visible="false">
+					<button
+									 follows="bottom|right"
+									 height="22"
+					 image_overlay="Search_Icon"
+									 image_pressed="PushButton_Press"
+									 image_pressed_selected="PushButton_Selected_Press"
+									 image_selected="PushButton_Selected_Press"
+					 is_toggle="true"
+					 layout="topleft"
+					 name="filter_button"
+									 right="-5"
+					 top_delta="0"
+									 visible="false"
+					 width="20" />
+				</layout_panel>
 
-                    <filter_editor
-		             background_image="TextField_Search_Off"
-		             enabled="true"
-		             follows="left|right|top"
-		             label="Filter Inventory Wearables"
-		             layout="topleft"
-		             left="5"
-		             width="290"
-		             height="25"
-		             name="look_item_filter"
-		             search_button_visible="true"
-		             text_color="black"
-		             visible="true"/>
-                    
-                </layout_panel>
-            </layout_stack>
-                </layout_panel>
+				<layout_panel
+				 auto_resize="false"
+				 background_visible="true"
+				 bg_alpha_color="DkGray2"
+				 height="30"
+				 name="filter_panel"
+				 width="311"
+				 visible="false">
 
+					<filter_editor
+			 background_image="TextField_Search_Off"
+			 enabled="true"
+			 follows="left|right|top"
+			 label="Filter Inventory Wearables"
+			 layout="topleft"
+			 left="5"
+			 width="290"
+			 height="25"
+			 name="look_item_filter"
+			 search_button_visible="true"
+			 text_color="black"
+			 visible="true"/>
 
-                <layout_panel
-         background_visible="false"
-         bg_alpha_color="DkGray2"
-                 auto_resize="true"
-         default_tab_group="3"
-         height="450"
-         min_height="80"
-         name="add_wearables_panel"
-         width="313"
-         tab_group="2"
-         user_resize="true"
-         visible="false">
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+
+
+		<layout_panel background_visible="false"
+									bg_alpha_color="DkGray2"
+									auto_resize="true"
+									height="450"
+									min_height="80"
+									name="add_wearables_panel"
+									width="313"
+									tab_group="2"
+									user_resize="true"
+									visible="false">
 
 			<!-- this icon represent dragbar between layout panels.
           	 This is a workaround implemented in EXT-7255 becouse of an issue with layout stack (EXT-7471) -->
-            <icon
-             follows="left|top|right"
-             height="10"
-             image_name="Dragbar"
-             left="0"
-             top_pad="-9"
-             width="313" />
+			<icon follows="left|top|right"
+						height="10"
+						image_name="Dragbar"
+						left="0"
+						top_pad="-9"
+						width="313" />
+			<inventory_panel allow_multi_select="true"
+											 background_visible="false"
+											 border="false"
+											 follows="left|top|right|bottom"
+											 height="418"
+											 layout="topleft"
+											 left="0"
+											 mouse_opaque="false"
+											 name="folder_view"
+											 top_pad="0"
+											 width="313"
+											 visible="false"/>
+			<panel name="filtered_wearables_panel"
+						 background_opaque="true"
+						 background_visible="false"
+						 layout="topleft"
+						 follows="left|top|right|bottom"
+						 border="false"
+						 height="418"
+						 left="0"
+						 mouse_opaque="false"
+						 width="310"
+						 top_delta="0"
+						 visible="true">
+				<wearable_items_list color="0.107 0.107 0.107 1"
+														 name="list_view"
+														 allow_select="true"
+														 layout="topleft"
+														 follows="all"
+														 multi_select="true"
+														 width="313"
+														 height="418"
+														 left="0"
+														 top="0"/>
+			</panel>
+			<button follows="bottom|left"
+							height="22"
+							left="2"
+							label="Wear Item"
+							layout="topleft"
+							name="plus_btn"
+							top_pad="5"
+							width="130" />
+		</layout_panel>
+	</layout_stack>
 
-                    <inventory_panel
-		             allow_multi_select="true"
-		             background_visible="false"
-		             border="false"
-		             follows="left|top|right|bottom"
-             height="418"
-		             layout="topleft"
-		             left="0"
-		             mouse_opaque="false"
-             name="folder_view"
-             top_pad="0"
-             width="313"
-		             visible="false"/>
-		            <panel
-		             name="filtered_wearables_panel"
-		             background_opaque="true"
-		             background_visible="false"
-		             layout="topleft"
-		             follows="left|top|right|bottom"
-		             border="false"
-             height="418"
-		             left="0"
-		             mouse_opaque="false"
-             width="310"
-		             top_delta="0"
-		             visible="true">
-		             <wearable_items_list
-		              color="0.107 0.107 0.107 1"
-                 name="list_view"
-		              allow_select="true"
-		              layout="topleft"
-		              follows="all"
-		              multi_select="true"
-                 width="313"
-                 height="418"
-		              left="0"
-		              top="0"/>
-		            </panel>
-            <button
-	         follows="bottom|left"
-	         height="22"
-	         left="2"
-	         label="Wear Item"
-	         layout="topleft"
-	         name="plus_btn"
-	         top_pad="5"
-	         width="130" />
 
-       </layout_panel>
-    </layout_stack>
+	<!-- BUTTON BAR -->
+	<panel
+	 background_visible="true"
+	 bevel_style="none"
+	 follows="bottom|left|right"
+	 height="27"
+	 layout="topleft"
+	 left="5"
+	 name="no_add_wearables_button_bar"
+	 top_pad="0"
+	 width="313">
+		<menu_button
+		 follows="bottom|left"
+		 height="25"
+		 image_hover_unselected="Toolbar_Left_Over"
+		 image_overlay="OptionsMenu_Off"
+		 image_selected="Toolbar_Left_Selected"
+		 image_unselected="Toolbar_Left_Off"
+		 layout="topleft"
+		 left="0"
+		 name="gear_menu_btn"
+		 top="1"
+		 width="31" />
+		<icon
+		 follows="bottom|left|right"
+		 height="25"
+		 image_name="Toolbar_Middle_Off"
+		 layout="topleft"
+		 left_pad="1"
+		 name="dummy_right_icon"
+		 width="250" />
+		<button
+		 follows="bottom|right"
+		 height="25"
+		 image_hover_unselected="Toolbar_Right_Over"
+		 image_overlay="Shop"
+		 image_selected="Toolbar_Right_Selected"
+		 image_unselected="Toolbar_Right_Off"
+		 layout="topleft"
+		 left_pad="1"
+		 name="shop_btn_1"
+		 top="1"
+		 tool_tip="Visit the SL Marketplace. You can also select something you are wearing, then click here to see more things like it"
+		 width="31" />
+	</panel>
 
 
-    <!-- BUTTON BAR -->
-    <panel
-     background_visible="true"
-     bevel_style="none"
-     follows="bottom|left|right"
-     height="27"
-     layout="topleft"
-     left="5"
-     name="no_add_wearables_button_bar"
-     top_pad="0"
-     width="313">
-        <menu_button
-         follows="bottom|left"
-         height="25"
-         image_hover_unselected="Toolbar_Left_Over"
-         image_overlay="OptionsMenu_Off"
-         image_selected="Toolbar_Left_Selected"
-         image_unselected="Toolbar_Left_Off"
-         layout="topleft"
-         left="0"
-         name="gear_menu_btn"
-         top="1"
-         width="31" />
-        <icon
-         follows="bottom|left|right"
-         height="25"
-         image_name="Toolbar_Middle_Off"
-         layout="topleft"
-         left_pad="1"
-         name="dummy_right_icon"
-         width="250" />
-        <button
-         follows="bottom|right"
-         height="25"
-         image_hover_unselected="Toolbar_Right_Over"
-         image_overlay="Shop"
-         image_selected="Toolbar_Right_Selected"
-         image_unselected="Toolbar_Right_Off"
-         layout="topleft"
-         left_pad="1"
-         name="shop_btn_1"
-         top="1"
-         tool_tip="Visit the SL Marketplace. You can also select something you are wearing, then click here to see more things like it"
-         width="31" />
-    </panel>
-    
-    
-    <!-- BUTTON BAR - WEARABLES ADDING MODE -->
-    <panel
-     background_visible="true"
-     bevel_style="none"
-     follows="left|right|bottom"
-     height="27"
-     layout="topleft"
-     left="5"
-     name="add_wearables_button_bar"
-     top_delta="0"
-     visible="false"
-     width="313">
-        <menu_button
-         follows="bottom|left"
-         height="25"
-         image_hover_unselected="Toolbar_Left_Over"
-         image_overlay="OptionsMenu_Off"
-         image_selected="Toolbar_Left_Selected"
-         image_unselected="Toolbar_Left_Off"
-         layout="topleft"
-         left="0"
-         name="wearables_gear_menu_btn"
-         top="1"
-         width="31" />
-        <button
-         follows="bottom|left"
-         height="25"
-         image_hover_unselected="Toolbar_Middle_Over"
-         image_overlay="Hierarchy_View_Disabled"
-         image_selected="Toolbar_Middle_Selected"
-         image_unselected="Toolbar_Middle_Off"
-         is_toggle="true"
-         layout="topleft"
-         left_pad="1"
-         name="folder_view_btn"
-         top="1"
-         width="31" />
-        <button
-         follows="bottom|left"
-         height="25"
-         image_hover_unselected="Toolbar_Middle_Over"
-         image_overlay="List_View_On"
-         image_selected="Toolbar_Middle_Selected"
-         image_unselected="Toolbar_Middle_Off"
-         is_toggle="true"
-         layout="topleft"
-         left_pad="1"
-         name="list_view_btn"
-         top="1"
-         width="31" />
-       <icon
-        follows="bottom|left|right"
-        height="25"
-         image_name="Toolbar_Middle_Off"
-        layout="topleft"
-        left_pad="1"
-         name="dummy_right_icon"
-         width="186" >
-       </icon>
-        <button
-         follows="bottom|right"
-         height="25"
-         image_hover_unselected="Toolbar_Right_Over"
-         image_overlay="Shop"
-         image_selected="Toolbar_Right_Selected"
-         image_unselected="Toolbar_Right_Off"
-         layout="topleft"
-         left_pad="1"
-         name="shop_btn_2"
-         top="1"
-         tool_tip="Visit the SL Marketplace. You can also select something you are wearing, then click here to see more things like it"
-         width="31" />
-    </panel>
+	<!-- BUTTON BAR - WEARABLES ADDING MODE -->
+	<panel
+	 background_visible="true"
+	 bevel_style="none"
+	 follows="left|right|bottom"
+	 height="27"
+	 layout="topleft"
+	 left="5"
+	 name="add_wearables_button_bar"
+	 top_delta="0"
+	 visible="false"
+	 width="313">
+		<menu_button
+		 follows="bottom|left"
+		 height="25"
+		 image_hover_unselected="Toolbar_Left_Over"
+		 image_overlay="OptionsMenu_Off"
+		 image_selected="Toolbar_Left_Selected"
+		 image_unselected="Toolbar_Left_Off"
+		 layout="topleft"
+		 left="0"
+		 name="wearables_gear_menu_btn"
+		 top="1"
+		 width="31" />
+		<button
+		 follows="bottom|left"
+		 height="25"
+		 image_hover_unselected="Toolbar_Middle_Over"
+		 image_overlay="Hierarchy_View_Disabled"
+		 image_selected="Toolbar_Middle_Selected"
+		 image_unselected="Toolbar_Middle_Off"
+		 is_toggle="true"
+		 layout="topleft"
+		 left_pad="1"
+		 name="folder_view_btn"
+		 top="1"
+		 width="31" />
+		<button
+		 follows="bottom|left"
+		 height="25"
+		 image_hover_unselected="Toolbar_Middle_Over"
+		 image_overlay="List_View_On"
+		 image_selected="Toolbar_Middle_Selected"
+		 image_unselected="Toolbar_Middle_Off"
+		 is_toggle="true"
+		 layout="topleft"
+		 left_pad="1"
+		 name="list_view_btn"
+		 top="1"
+		 width="31" />
+		<icon
+		 follows="bottom|left|right"
+		 height="25"
+			image_name="Toolbar_Middle_Off"
+		 layout="topleft"
+		 left_pad="1"
+			name="dummy_right_icon"
+			width="186" >
+		</icon>
+		<button
+		 follows="bottom|right"
+		 height="25"
+		 image_hover_unselected="Toolbar_Right_Over"
+		 image_overlay="Shop"
+		 image_selected="Toolbar_Right_Selected"
+		 image_unselected="Toolbar_Right_Off"
+		 layout="topleft"
+		 left_pad="1"
+		 name="shop_btn_2"
+		 top="1"
+		 tool_tip="Visit the SL Marketplace. You can also select something you are wearing, then click here to see more things like it"
+		 width="31" />
+	</panel>
 
-    <!-- SAVE AND REVERT BUTTONS -->
-    <panel
-     follows="left|right|bottom"
-     height="30"
-     layout="topleft"
-     left="4"
-     top_pad="2"
-     name="save_revert_button_bar"
-     width="300">
-			<layout_stack
-     	         follows="bottom|left|right"
-		         height="23"
-		         layout="topleft"
-		         mouse_opaque="false"
-		         name="button_bar_ls"
-		         left="0"
-		         orientation="horizontal"
-		         top="0"
-		         width="313">	
-			    <layout_panel
-			         follows="bottom|left|right"
-			         height="23"
-                     layout="bottomleft"
-                     left="0"			
-                     mouse_opaque="false"
-                     name="save_btn_lp"
-                     auto_resize="true"
-                     width="156">
-        <button
+	<!-- SAVE AND REVERT BUTTONS -->
+	<panel
+	 follows="left|right|bottom"
+	 height="30"
+	 layout="topleft"
+	 left="4"
+	 top_pad="2"
+	 name="save_revert_button_bar"
+	 width="300">
+		<layout_stack
+						 follows="bottom|left|right"
+					 height="23"
+					 layout="topleft"
+					 mouse_opaque="false"
+					 name="button_bar_ls"
+					 left="0"
+					 orientation="horizontal"
+					 top="0"
+					 width="313">
+			<layout_panel
+					 follows="bottom|left|right"
+					 height="23"
+								 layout="bottomleft"
+								 left="0"
+								 mouse_opaque="false"
+								 name="save_btn_lp"
+								 auto_resize="true"
+								 width="156">
+				<button
                          follows="bottom|left|right"
          height="23"
          label="Save"
@@ -524,7 +515,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
          name="save_btn"
          top="0"
          width="155" />
-        <button
+				<button
                          follows="bottom|right"
          height="23"
          name="save_flyout_btn"
@@ -539,17 +530,17 @@ It is calculated as border_size + 2*UIResizeBarOverlap
          image_pressed_selected="SegmentedBtn_Right_Selected_Press"
          image_overlay="Arrow_Small_Up"
          width="20"/>
-			    </layout_panel>
-			    <layout_panel
-                     follows="bottom|left|right"
-                     height="23"
-                     layout="bottomleft"
-                     left_pad="3"			
-                     mouse_opaque="false"
-                     name="revert_btn_lp"
-                     auto_resize="true"
-                     width="147">
-        <button
+			</layout_panel>
+			<layout_panel
+								 follows="bottom|left|right"
+								 height="23"
+								 layout="bottomleft"
+								 left_pad="3"
+								 mouse_opaque="false"
+								 name="revert_btn_lp"
+								 auto_resize="true"
+								 width="147">
+				<button
          follows="bottom|left|right"
          height="23"
                          left="0"
@@ -559,7 +550,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
          top="0"
          tool_tip="Revert to last saved version"
          width="147" />
-			    </layout_panel>
-			</layout_stack>
-    </panel>
+			</layout_panel>
+		</layout_stack>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index ed274d0233..31a2bbd1cb 100755
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <!-- Side tray panel -->
 <panel
- default_tab_group="1"
  follows="all"
  height="449"
  label="People"
@@ -60,7 +59,6 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
      layout="topleft"
      left="3"
      name="tabs"
-     tab_group="1"
      tab_min_width="70"
      tab_height="30"
      tab_position="top"
diff --git a/indra/newview/skins/default/xui/es/sidepanel_inventory.xml b/indra/newview/skins/default/xui/es/sidepanel_inventory.xml
index f68dcc65e3..9ce14c856f 100755
--- a/indra/newview/skins/default/xui/es/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/es/sidepanel_inventory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Cosas" name="objects panel">
-	<panel label="" name="sidepanel__inventory_panel">
+	<panel label="" name="sidepanel_inventory_panel">
 		<layout_stack name="inventory_layout_stack">
 			<layout_panel name="inbox_layout_panel">
 				<panel label="" name="marketplace_inbox">
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml b/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml
index 1b9c832679..ec7dd8c095 100755
--- a/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Choses" name="objects panel">
-	<panel label="" name="sidepanel__inventory_panel">
+	<panel label="" name="sidepanel_inventory_panel">
 		<layout_stack name="inventory_layout_stack">
 			<layout_panel name="inbox_layout_panel">
 				<panel label="" name="marketplace_inbox">
diff --git a/indra/newview/skins/default/xui/it/sidepanel_inventory.xml b/indra/newview/skins/default/xui/it/sidepanel_inventory.xml
index 5ac0961bd7..907857bf5a 100755
--- a/indra/newview/skins/default/xui/it/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/it/sidepanel_inventory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Cose" name="objects panel">
-	<panel label="" name="sidepanel__inventory_panel">
+	<panel label="" name="sidepanel_inventory_panel">
 		<layout_stack name="inventory_layout_stack">
 			<layout_panel name="inbox_layout_panel">
 				<panel label="" name="marketplace_inbox">
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
index 51d6d48f90..32e84ce542 100755
--- a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="もの" name="objects panel">
-	<panel label="" name="sidepanel__inventory_panel">
+	<panel label="" name="sidepanel_inventory_panel">
 		<layout_stack name="inventory_layout_stack">
 			<layout_panel name="inbox_layout_panel">
 				<panel label="" name="marketplace_inbox">
diff --git a/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml b/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml
index c2e50473a5..1034a06f1f 100755
--- a/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Rzeczy" name="objects panel">
-	<panel label="" name="sidepanel__inventory_panel">
+	<panel label="" name="sidepanel_inventory_panel">
 		<panel name="button_panel">
 			<layout_stack name="button_panel_ls">
 				<layout_panel name="info_btn_lp">
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml b/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml
index 7908ea5f3a..c44345323f 100755
--- a/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Coisas" name="objects panel">
-	<panel label="" name="sidepanel__inventory_panel">
+	<panel label="" name="sidepanel_inventory_panel">
 		<layout_stack name="inventory_layout_stack">
 			<layout_panel name="inbox_layout_panel">
 				<panel label="" name="marketplace_inbox">
diff --git a/indra/newview/skins/default/xui/ru/sidepanel_inventory.xml b/indra/newview/skins/default/xui/ru/sidepanel_inventory.xml
index c106c2de79..1741f63074 100755
--- a/indra/newview/skins/default/xui/ru/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/ru/sidepanel_inventory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Вещи" name="objects panel">
-	<panel label="" name="sidepanel__inventory_panel">
+	<panel label="" name="sidepanel_inventory_panel">
 		<layout_stack name="inventory_layout_stack">
 			<layout_panel name="inbox_layout_panel">
 				<panel label="" name="marketplace_inbox">
diff --git a/indra/newview/skins/default/xui/tr/sidepanel_inventory.xml b/indra/newview/skins/default/xui/tr/sidepanel_inventory.xml
index 938b5a76d8..3241d52c81 100755
--- a/indra/newview/skins/default/xui/tr/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/tr/sidepanel_inventory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Eşyalar" name="objects panel">
-	<panel label="" name="sidepanel__inventory_panel">
+	<panel label="" name="sidepanel_inventory_panel">
 		<layout_stack name="inventory_layout_stack">
 			<layout_panel name="inbox_layout_panel">
 				<panel label="" name="marketplace_inbox">
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml b/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml
index c8aae15011..4034a7154f 100755
--- a/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="事物" name="objects panel">
-	<panel label="" name="sidepanel__inventory_panel">
+	<panel label="" name="sidepanel_inventory_panel">
 		<layout_stack name="inventory_layout_stack">
 			<layout_panel name="inbox_layout_panel">
 				<panel label="" name="marketplace_inbox">
-- 
cgit v1.2.3