SL-15034 Revisions to dedicated Avatar menus

4 files changed, 86 insertions, 60 deletions

diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
index 856bf4ce73..13e4b9ba7b 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -37,39 +37,47 @@
      layout="topleft" />
 
   <menu_item_call
-  label="Outfits..."
+  label="Now wearing..."
+  name="NowWearing">
+    <menu_item_call.on_click
+     function="NowWearing" />
+    <menu_item_call.on_enable
+     function="Edit.EnableCustomizeAvatar" />
+  </menu_item_call>
+  <menu_item_call
+  label="My Outfits..."
   name="Change Outfit">
     <menu_item_call.on_click
      function="CustomizeAvatar" />
     <menu_item_call.on_enable
      function="Edit.EnableCustomizeAvatar" />
   </menu_item_call>
-  <menu_item_call label="Current outfit..."
-layout="topleft"
-name="Edit Outfit">
+  <menu_item_call label="Hover height..."
+     layout="topleft"
+     name="Hover Height">
     <menu_item_call.on_click
-     function="EditOutfit" />
+     function="HoverHeight" />
     <menu_item_call.on_enable
-     function="Edit.EnableCustomizeAvatar" />
+     function="Edit.EnableHoverHeight" />
   </menu_item_call>
   <menu_item_call label="Shape..."
     layout="topleft"
-    name="Edit My Shape">
+    name="Edit Shape">
     <menu_item_call.on_click
      function="EditShape" />
     <menu_item_call.on_enable
      function="Edit.EnableEditShape" />
   </menu_item_call>
-  <menu_item_call label="Hover height..."
-     layout="topleft"
-     name="Hover Height">
-     <menu_item_call.on_click
-      function="HoverHeight" />
-     <menu_item_call.on_enable
-      function="Edit.EnableHoverHeight" />
+  <menu_item_call label="Edit outfit parts..."
+    layout="topleft"
+    name="Edit Outfit">
+    <menu_item_call.on_click
+     function="EditOutfit" />
+    <menu_item_call.on_enable
+     function="Edit.EnableCustomizeAvatar" />
   </menu_item_call>
   <context_menu
-  label="Take Off"
+  label="Take off"
   layout="topleft"
   name="Take Off &gt;">
     <context_menu
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_self.xml b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
index a46d9aed55..500b6fffc2 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
@@ -3,7 +3,16 @@
  layout="topleft"
  name="Self Pie">
     <menu_item_call
-     label="Outfits..."
+     label="Now wearing..."
+     layout="topleft"
+     name="NowWearing">
+        <menu_item_call.on_click
+         function="NowWearing" />
+        <menu_item_call.on_enable
+         function="Edit.EnableCustomizeAvatar" />
+    </menu_item_call>
+    <menu_item_call
+     label="My Outfits..."
      layout="topleft"
      name="Chenge Outfit">
         <menu_item_call.on_click
@@ -11,22 +20,6 @@
         <menu_item_call.on_enable
          function="Edit.EnableCustomizeAvatar" />
     </menu_item_call>
-    <menu_item_call label="Current outfit..." 
-    layout="topleft"
-    name="Edit Outfit">
-       <menu_item_call.on_click
-        function="EditOutfit" />
-       <menu_item_call.on_enable
-        function="Edit.EnableCustomizeAvatar" />
-   </menu_item_call>
-    <menu_item_call label="Shape..." 
-    layout="topleft"
-    name="Edit My Shape">
-       <menu_item_call.on_click
-        function="EditShape" />
-       <menu_item_call.on_enable
-        function="Edit.EnableEditShape" />
-   </menu_item_call>
    <menu_item_call label="Hover height..."
      layout="topleft"
      name="Hover Height">
@@ -35,8 +28,25 @@
      <menu_item_call.on_enable
       function="Edit.EnableHoverHeight" />
    </menu_item_call>
+   <menu_item_call label="Shape..." 
+    layout="topleft"
+    name="Edit Shape">
+       <menu_item_call.on_click
+        function="EditShape" />
+       <menu_item_call.on_enable
+        function="Edit.EnableEditShape" />
+   </menu_item_call>
+   <menu_item_call
+      label="Edit outfit parts..." 
+      layout="topleft"
+      name="Edit Outfit">
+       <menu_item_call.on_click
+        function="EditOutfit" />
+       <menu_item_call.on_enable
+        function="Edit.EnableCustomizeAvatar" />
+   </menu_item_call>
   <context_menu
-    label="Take Off"
+    label="Take off"
     layout="topleft"
     name="Take Off &gt;">
     <context_menu
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 456d131d9c..69d17e6547 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -165,50 +165,50 @@
      name="Avatar"
      tear_off="true">
        <menu_item_call
-         label="Complete avatars..."
-         name="Avatar Picker">
-            <menu_item_call.on_click
-             function="Floater.ToggleOrBringToFront"
-             parameter="avatar" />
-       </menu_item_call>
-       <menu_item_call
-         label="Outfits..."
-         name="ChangeOutfit"
+         label="Now wearing..."
+         name="NowWearing"
          shortcut="control|O">
             <menu_item_call.on_click
-             function="Floater.ToggleOrBringToFront"
-             parameter="appearance" />
+             function="NowWearing" />
             <menu_item_call.on_enable
              function="Edit.EnableCustomizeAvatar" />
        </menu_item_call>
-       <menu_item_call 
-         label="Current outfit..."
-         layout="topleft"
-         name="Edit Outfit">
+       <menu_item_call
+         label="My outfits..."
+         name="ChangeOutfit">
             <menu_item_call.on_click
-             function="EditOutfit" />
+             function="CustomizeAvatar" />
             <menu_item_call.on_enable
              function="Edit.EnableCustomizeAvatar" />
        </menu_item_call>
-       <menu_item_call 
-         label="Shape..."
+       <menu_item_call label="Hover height..."
          layout="topleft"
-         name="Edit My Shape">
+         name="Hover Height">
+            <menu_item_call.on_click
+             function="HoverHeight" />
+            <menu_item_call.on_enable
+             function="Edit.EnableHoverHeight" />
+      </menu_item_call>
+      <menu_item_call
+        label="Edit shape..."
+        layout="topleft"
+        name="Edit My Shape">
             <menu_item_call.on_click
              function="EditShape" />
             <menu_item_call.on_enable
              function="Edit.EnableEditShape" />
       </menu_item_call>
-       <menu_item_call label="Hover height..."
-         layout="topleft"
-         name="Hover Height">
+      <menu_item_call
+        label="Edit outfit parts..."
+        layout="topleft"
+        name="Edit Outfit">
             <menu_item_call.on_click
-             function="HoverHeight" />
+             function="EditOutfit" />
             <menu_item_call.on_enable
-             function="Edit.EnableHoverHeight" />
+             function="Edit.EnableCustomizeAvatar" />
       </menu_item_call>
       <menu
-        label="Take Off"
+        label="Take off"
         layout="topleft"
         name="Take Off &gt;">
         <menu
@@ -390,8 +390,16 @@
         </menu_item_call>
       </menu>
       <menu_item_separator/>
+      <menu_item_call
+        label="Complete avatars..."
+        name="Avatar Picker">
+        <menu_item_call.on_click
+         function="Floater.ToggleOrBringToFront"
+         parameter="avatar" />
+      </menu_item_call>
+      <menu_item_separator/>
 
-       <menu_item_call
+      <menu_item_call
          label="Sit / stand"
          layout="topleft"
          shortcut="alt|shift|S"
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 c4c51afa82..d625f89f3b 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -81,7 +81,7 @@
             name="title"
             text_color="LtGray"
             top="0"
-            value="Current Outfit"
+            value="Edit outfit parts"
             use_ellipses="true"
             width="275" />