merge

--HG--
branch : product-engine

3 files changed, 150 insertions, 101 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
index 60a0095d5f..58d3dbcc37 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -14,131 +14,82 @@
  border="false">
    <tab_container
      follows="all"
-     height="509"
+     height="539"
      layout="topleft"
-     left="7"
+     left="5"
      name="appearance_tabs"
      tab_min_width="140"
      tab_height="30"
      tab_position="top"
      halign="center"
      top="8"
-     width="312">
+     width="315">
          <panel
            class="outfits_list"
            filename="panel_outfits_list.xml"
-           height="490"
+           height="520"
            name="outfitslist_tab"
            background_visible="true"
            help_topic="my_outfits_tab"
            follows="all"
            label="MY OUTFITS"
            layout="topleft"
-           width="312" />
+           width="315" />
          <panel
            background_visible="true"
            bg_alpha_color="DkGray"
            class="panel_wearing"
+           filename="panel_outfits_wearing.xml"
            follows="all"
-           height="490"          
+           height="520"
            help_topic="now_wearing_tab"
            label="WEARING"
            layout="topleft"
            name="cof_tab"
-           width="312">
-            <wearable_items_list
-             allow_select="true"
-             follows="all"
-             height="490"
-             keep_one_selected="true"
-             left="3"
-             multi_select="true"
-             name="cof_items_list"
-             standalone="false"
-             top="0"
-             translate="false"
-             width="307"
-             worn_indication_enabled="false"
-            />
-         </panel>
+           width="315" />
    </tab_container>
-	 <panel
-       background_visible="true"
-	  follows="bottom|left|right"
-	  height="57"
-	  layout="topleft"
-	  left="9"
-	  top_pad="-1"
-	  visible="true"
-	  name="bottom_panel"
-	  width="310">
-        <button
-         follows="bottom|left"
-         tool_tip="Show additional options"
-         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="1"
-         name="options_gear_btn"
-         top="1"
-         width="31" />
-     <icon
-      follows="bottom|left|right"
-      height="25"
-      image_name="Toolbar_Middle_Off"
-      layout="topleft"
-      left_pad="1"
-      name="dummy_icon"
-      width="241"
-        />
 
-        <button
-         follows="bottom|right"
-         height="25"
-         image_hover_unselected="Toolbar_Right_Over"
-          image_overlay="TrashItem_Off"
-          image_selected="Toolbar_Right_Selected"
-          image_unselected="Toolbar_Right_Off"
-         layout="topleft"
-         left_pad="1"
-         name="trash_btn"
-      tool_tip="Delete selected outfit"
-         width="31"/>         
-     <button
-       follows="bottom|left"
-       height="23"
-       label="Save As"
-       left="0"         
-       layout="topleft"
-       name="save_btn"
-       top_pad="6"
-       width="155" />
-     <button
-       follows="bottom|left"
-       height="23"
-       name="save_flyout_btn"
-       label=""
+   <panel
+       background_visible="true"
+       follows="bottom|left|right"
+       height="27"
        layout="topleft"
-       left_pad="-20"
-       tab_stop="false"
-       image_selected="SegmentedBtn_Right_Selected_Press"
-       image_unselected="SegmentedBtn_Right_Off"
-       image_pressed="SegmentedBtn_Right_Press"
-       image_pressed_selected="SegmentedBtn_Right_Selected_Press"
-       image_overlay="Arrow_Small_Up"
-       width="20"/>
-     <button
-      follows="bottom|left|right" 
-      height="23" 
-      label="Wear"
-      layout="topleft"
-      name="wear_btn"
-      left_pad="3"
-      tool_tip="Wear selected outfit"
-      width="152" />
-	 </panel>
-       
+       left="9"
+       top_pad="1"
+       visible="true"
+       name="bottom_panel"
+       width="310">
+      <button
+           follows="bottom|left"
+           height="23"
+           label="Save As"
+           left="0"
+           layout="topleft"
+           name="save_btn"
+           top_pad="0"
+           width="155" />
+      <button
+           follows="bottom|left"
+          height="23"
+           name="save_flyout_btn"
+           label=""
+           layout="topleft"
+           left_pad="-20"
+           tab_stop="false"
+           image_selected="SegmentedBtn_Right_Selected_Press"
+           image_unselected="SegmentedBtn_Right_Off"
+           image_pressed="SegmentedBtn_Right_Press"
+           image_pressed_selected="SegmentedBtn_Right_Selected_Press"
+           image_overlay="Arrow_Small_Up"
+           width="20"/>
+      <button
+          follows="bottom|left|right" 
+          height="23" 
+          label="Wear"
+          layout="topleft"
+          name="wear_btn"
+          left_pad="3"
+          tool_tip="Wear selected outfit"
+          width="152" />
+   </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_list.xml b/indra/newview/skins/default/xui/en/panel_outfits_list.xml
index aea4e939df..62b23aa74c 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_list.xml
@@ -4,7 +4,7 @@
    bg_alpha_color="DkGray"
    border="false"
    follows="all"
-   height="400"
+   height="430"
    name="Outfits"
    layout="topleft"
    left="0"
@@ -23,6 +23,50 @@
      left="3"
      name="outfits_accordion"
      top="0"
-     width="307">
+     width="309">
     </accordion>
+    <panel
+     background_visible="true"
+	 follows="bottom|left|right"
+	 height="28"
+	 layout="topleft"
+	 left="4"
+	 top_pad="0"
+	 visible="true"
+	 name="bottom_panel"
+	 width="312">
+     <button
+       follows="bottom|left"
+       tool_tip="Show additional options"
+       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="options_gear_btn"
+       top="1"
+       width="31" />
+     <icon
+       follows="bottom|left|right"
+       height="25"
+       image_name="Toolbar_Middle_Off"
+       layout="topleft"
+       left_pad="1"
+       name="dummy_icon"
+       width="243"/>
+      <button
+       follows="bottom|right"
+       height="25"
+       image_hover_unselected="Toolbar_Right_Over"
+       image_overlay="TrashItem_Off"
+       image_selected="Toolbar_Right_Selected"
+       image_unselected="Toolbar_Right_Off"
+       layout="topleft"
+       left_pad="1"
+       name="trash_btn"
+       tool_tip="Delete selected outfit"
+       width="31"/>
+    </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
new file mode 100644
index 0000000000..2fbbf6610c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_visible="true"
+ bg_alpha_color="DkGray"
+ follows="all"
+ height="430"
+ layout="topleft"
+ left="0"
+ name="Wearing"
+ top="0"
+ width="312">
+    <wearable_items_list
+     follows="all"
+     height="400"
+     layout="topleft"
+     left="3"
+     multi_select="true"
+     name="cof_items_list"
+     standalone="false"
+     top="0"
+     width="309"
+     worn_indication_enabled="false" />
+    <panel
+     background_visible="true"
+     follows="bottom|left|right"
+     height="28"
+     layout="topleft"
+     left="4"
+     name="bottom_panel"
+     top_pad="0"
+     width="312">
+        <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="options_gear_btn"
+         tool_tip="Show additional options"
+         top="1"
+         width="31" />
+        <icon
+         follows="bottom|left|right"
+         height="25"
+         image_name="Toolbar_Right_Off"
+         layout="topleft"
+         left_pad="1"
+         name="dummy_icon"
+         width="274" />
+    </panel>
+</panel>