merge from PE's viewer-release.

8 files changed, 60 insertions, 16 deletions

diff --git a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
index 9c3151fe07..8c8bb29baf 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
@@ -8,6 +8,9 @@
      name="wear_replace">
         <on_click
          function="Outfit.WearReplace" />
+        <on_enable
+         function="Outfit.OnEnable"
+         parameter="wear_replace" />
         <on_visible
          function="Outfit.OnVisible"
          parameter="wear_replace" />
diff --git a/indra/newview/skins/default/xui/en/menu_wearing_gear.xml b/indra/newview/skins/default/xui/en/menu_wearing_gear.xml
new file mode 100644
index 0000000000..84431a2f69
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_wearing_gear.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu
+ layout="topleft"
+ name="Gear Wearing">
+    <menu_item_call
+     label="Edit Outfit"
+     layout="topleft"
+     name="edit">
+        <on_click
+         function="Gear.Edit" />
+    </menu_item_call>
+</menu>
diff --git a/indra/newview/skins/default/xui/en/menu_wearing_tab.xml b/indra/newview/skins/default/xui/en/menu_wearing_tab.xml
new file mode 100644
index 0000000000..85505f9972
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_wearing_tab.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu
+ layout="topleft"
+ name="Wearing">
+    <menu_item_call
+     label="Edit Outfit"
+     layout="topleft"
+     name="edit">
+        <on_click
+         function="Wearing.Edit" />
+    </menu_item_call>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
index f016c27b0a..d2c8ab159f 100644
--- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
@@ -31,6 +31,7 @@
              item_pad="3"
              layout="topleft"
              left="0"
+             keep_selection_visible_on_reshape="true"
              multi_select="true"
              name="list_attachments"
              top="0"
@@ -45,6 +46,7 @@
              follows="all"
              height="10"
              item_pad="3"
+             keep_selection_visible_on_reshape="true"
              layout="topleft"
              left="0"
              multi_select="true"
@@ -61,6 +63,7 @@
              follows="all"
              height="10"
              item_pad="3"
+             keep_selection_visible_on_reshape="true"
              layout="topleft"
              left="0"
              multi_select="true"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
index 1ab9f722d0..06255353a7 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -390,7 +390,7 @@
         <button
          follows="bottomleft"
          height="23"
-         label="Revert"
+         label="Undo Changes"
          layout="topleft"
          left_pad="7"
          name="revert_button"
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 a59070496e..b365540d1f 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -34,22 +34,32 @@
            follows="all"
            label="MY OUTFITS"
            layout="topleft"
-           width="315" />
-         <inventory_panel
-           follows="all"
+           width="312" />
+         <panel
            background_visible="true"
-           background_opaque="true"
-           label="WEARING"
+           class="panel_wearing"
+           follows="all"
+           height="490"          
            help_topic="now_wearing_tab"
-          allow_multi_select="true"
-           border="false"
-           left="0"
-           top="0"
-           mouse_opaque="true"
+           label="WEARING"
+           layout="topleft"
            name="cof_tab"
-           start_folder="Current Outfit"
-           use_label_suffix="true" 
-           width="315" />
+           width="312">
+            <wearable_items_list
+             allow_select="true"
+             follows="all"
+             height="490"
+             keep_one_selected="true"
+             left="1"
+             multi_select="true"
+             name="cof_items_list"
+             standalone="false"
+             top="0"
+             translate="false"
+             width="310"
+             worn_indication_enabled="false"
+            />
+         </panel>
    </tab_container>
 	 <panel
        background_visible="true"
@@ -84,7 +94,7 @@
       width="241"
         />
 
-        <dnd_button
+        <button
          follows="bottom|right"
          height="25"
          image_hover_unselected="Toolbar_Right_Over"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index e189d11d35..9a07d3a48a 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -21,6 +21,9 @@ width="333">
    <string
    name="Now Wearing"
    value="Now wearing..." />
+   <string
+   name="Changing outfits"
+   value="Changing outfits" />
    <panel
    background_opaque="true"
    background_visible="true"
diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml b/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml
index dbe1ea2874..49c2abe1a5 100644
--- a/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml
@@ -14,5 +14,6 @@
   <!-- style for inventory list item WORN on avatar -->
   <worn_style
    font="SansSerifSmall"
-   font.style="BOLD" />
+   font.style="BOLD"
+   color="green" />
 </inventory_list_item>