From cf2f0eddeb066d862151154d0d35f7e9f716270b Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 1 Jun 2020 18:24:52 +0300
Subject: SL-13278 FIXED Creating default clothing not accessible through "Edit
 My Outfit" for any type that does not already exist

---
 .../newview/skins/default/xui/en/menu_wearable_list_item.xml  | 11 +++++++++++
 1 file changed, 11 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
index aa56b4ba63..7370dace7f 100644
--- a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
@@ -4,6 +4,7 @@
     <menu_item_call
      label="Replace"
      layout="topleft"
+     visible="false"
      name="wear_replace">
         <on_click
          function="Wearable.Wear" />
@@ -11,6 +12,7 @@
     <menu_item_call
      label="Wear"
      layout="topleft"
+     visible="false"
      name="wear_wear">
         <on_click
          function="Wearable.Wear" />
@@ -18,6 +20,7 @@
     <menu_item_call
      label="Add"
      layout="topleft"
+     visible="false"
      name="wear_add">
         <on_click
          function="Wearable.Add" />
@@ -25,6 +28,7 @@
     <menu_item_call
      label="Take Off / Detach"
      layout="topleft"
+     visible="false"
      name="take_off_or_detach">
         <on_click
          function="Wearable.TakeOffDetach" />
@@ -32,6 +36,7 @@
     <menu_item_call
      label="Detach"
      layout="topleft"
+     visible="false"
      name="detach">
         <on_click
          function="Attachment.Detach" />
@@ -47,6 +52,7 @@
     <menu_item_call
      label="Take Off"
      layout="topleft"
+     visible="false"
      name="take_off">
         <on_click
          function="Clothing.TakeOff" />
@@ -54,6 +60,7 @@
     <menu_item_call
      label="Edit"
      layout="topleft"
+     visible="false"
      name="edit">
         <on_click
          function="Wearable.Edit" />
@@ -61,6 +68,7 @@
     <menu_item_call
      label="Item Profile"
      layout="topleft"
+     visible="false"
      name="object_profile">
         <on_click
          function="Attachment.Profile" />
@@ -68,6 +76,7 @@
     <menu_item_call
      label="Show Original"
      layout="topleft"
+     visible="false"
      name="show_original">
         <on_click
          function="Wearable.ShowOriginal" />
@@ -75,6 +84,7 @@
     <menu_item_call
      label="Create New"
      layout="topleft"
+     visible="false"
      name="create_new"
      translate="false">
         <on_click
@@ -83,6 +93,7 @@
     <menu_item_call
      label="--no options--"
      layout="topleft"
+     visible="false"
      name="--no options--"
      translate="false">
     </menu_item_call>
-- 
cgit v1.2.3


From 307534c9781b312608ccce6a9b4e12499a66170a Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 16 Jun 2020 17:26:39 +0300
Subject: SL-13463 Add 'Reset scripts' button to Content tab of Build floater

---
 indra/newview/skins/default/xui/en/floater_tools.xml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 0abee2ff80..1377bad6cf 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2575,13 +2575,22 @@ even though the user gets a free copy.
              border_visible="true"
              bevel_style="in"
              follows="left|top|right"
-             height="325"
+             height="300"
              layout="topleft"
              left="10"
              name="contents_inventory"
              top="50"
              width="275" />
-		</panel>
+            <button
+             follows="left|bottom"
+             height="23"
+             label="Reset Scripts"
+             layout="topleft"
+             left="10"
+             name="btn_reset_scripts"
+             bottom="-1"
+             width="118" />
+       </panel>
         </tab_container>
 	<panel
 	 follows="left|top"
-- 
cgit v1.2.3


From ca6bb3506d13975bd5a817a09658fa78d7716cc6 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 19 Jun 2020 17:53:51 +0300
Subject: SL-13479 Dedicated top-level menu for avatar editing

---
 .../skins/default/xui/en/floater_avatar.xml        |   2 +-
 .../skins/default/xui/en/floater_my_appearance.xml |   2 +-
 .../skins/default/xui/en/floater_my_scripts.xml    |   2 +-
 .../skins/default/xui/en/menu_attachment_other.xml |   5 +-
 .../skins/default/xui/en/menu_attachment_self.xml  | 115 ++----
 .../skins/default/xui/en/menu_avatar_other.xml     |   5 +-
 .../skins/default/xui/en/menu_avatar_self.xml      | 451 ++++++++++-----------
 indra/newview/skins/default/xui/en/menu_viewer.xml | 279 +++++++------
 .../skins/default/xui/en/panel_edit_wearable.xml   |   2 +-
 .../skins/default/xui/en/panel_outfit_edit.xml     |   2 +-
 10 files changed, 411 insertions(+), 454 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_avatar.xml b/indra/newview/skins/default/xui/en/floater_avatar.xml
index 92c5d8bcbe..3df2683ca8 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar.xml
@@ -14,7 +14,7 @@
  help_topic="avatar"
  save_rect="true"
  save_visibility="true"
- title="CHOOSE AN AVATAR"
+ title="COMPLETE AVATARS"
  width="700">
     <web_browser
       top="25"
diff --git a/indra/newview/skins/default/xui/en/floater_my_appearance.xml b/indra/newview/skins/default/xui/en/floater_my_appearance.xml
index fdea7a821a..35ad87ceb0 100644
--- a/indra/newview/skins/default/xui/en/floater_my_appearance.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_appearance.xml
@@ -11,7 +11,7 @@
   save_rect="true"
   single_instance="true"
   reuse_instance="true"
-  title="APPEARANCE"
+  title="AVATAR"
   min_height="440"
   min_width="333"
   width="333">
diff --git a/indra/newview/skins/default/xui/en/floater_my_scripts.xml b/indra/newview/skins/default/xui/en/floater_my_scripts.xml
index 3b0b6723c7..ee6defce9d 100644
--- a/indra/newview/skins/default/xui/en/floater_my_scripts.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_scripts.xml
@@ -7,7 +7,7 @@
  layout="topleft"
  name="myscripts"
  save_rect="true"
- title="My Scripts"
+ title="ATTACHMENT SCRIPTS"
  min_width="620"
  width="620">
   <panel
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
index 38f4b7715f..7ad692038e 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -173,16 +173,13 @@
           parameter="avatar_render_settings" />
       </menu_item_call>
       </context_menu>
-  <menu_item_separator
-       layout="topleft" name="Impostor seperator"/>
-
   <menu_item_call
      enabled="false"
      label="Block Particle Owner"
      name="Mute Particle">
     <menu_item_call.on_click
      function="Particle.Mute" />
-    <menu_item_call.on_enable
+    <menu_item_call.on_visible
      function="EnableMuteParticle" />
   </menu_item_call>
 </context_menu>
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 59faf6a9f5..03c05e6591 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -4,7 +4,7 @@
  name="Attachment Pie">
     <menu_item_call
      enabled="false"
-     label="Touch"
+     label="Touch item"
      layout="topleft"
      name="Attachment Object Touch">
         <menu_item_call.on_click
@@ -13,19 +13,9 @@
          function="Object.EnableTouch"
          name="EnableTouch"/>
     </menu_item_call>
-    <!--menu_item_call
-     label="Stand Up"
-     layout="topleft"
-     name="Stand Up">
-        <menu_item_call.on_click
-         function="Self.StandUp"
-         parameter="" />
-        <menu_item_call.on_enable
-         function="Self.EnableStandUp" />
-    </menu_item_call-->
     <menu_item_call
      enabled="false"
-     label="Edit"
+     label="Edit item"
      layout="topleft"
      name="Edit...">
         <menu_item_call.on_click
@@ -35,7 +25,7 @@
     </menu_item_call>
     <menu_item_call
      enabled="false"
-     label="Detach"
+     label="Detach item"
      layout="topleft"
      name="Detach">
         <menu_item_call.on_click
@@ -46,36 +36,15 @@
   <menu_item_separator
     layout="topleft" />
 
-    <menu_item_call
-     label="Sit Down"
-     layout="topleft"
-     name="Sit Down Here">
-        <menu_item_call.on_click
-         function="Self.SitDown"
-         parameter="" />
-        <menu_item_call.on_enable
-         function="Self.EnableSitDown" />
-    </menu_item_call>
-
-  <menu_item_call
-label="Stand Up"
-layout="topleft"
-name="Stand Up">
-    <menu_item_call.on_click
-     function="Self.StandUp"
-     parameter="" />
-    <menu_item_call.on_enable
-     function="Self.EnableStandUp" />
-  </menu_item_call>
   <menu_item_call
-  label="My Appearance"
+  label="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="Edit My Outfit"
+  <menu_item_call label="Edit current outfit..."
 layout="topleft"
 name="Edit Outfit">
     <menu_item_call.on_click
@@ -83,7 +52,7 @@ name="Edit Outfit">
     <menu_item_call.on_enable
      function="Edit.EnableCustomizeAvatar" />
   </menu_item_call>
-  <menu_item_call label="Edit My Shape"
+  <menu_item_call label="Shape..."
     layout="topleft"
     name="Edit My Shape">
     <menu_item_call.on_click
@@ -91,7 +60,7 @@ name="Edit Outfit">
     <menu_item_call.on_enable
      function="Edit.EnableEditShape" />
   </menu_item_call>
-  <menu_item_call label="Hover Height"
+  <menu_item_call label="Hover height..."
      layout="topleft"
      name="Hover Height">
      <menu_item_call.on_click
@@ -99,42 +68,42 @@ name="Edit Outfit">
      <menu_item_call.on_enable
       function="Edit.EnableHoverHeight" />
   </menu_item_call>
-  <menu_item_call label="Reset Skeleton"
-       layout="topleft"
-       name="Reset Skeleton">
-       <menu_item_call.on_click
-        function="Avatar.ResetSkeleton" />
-  </menu_item_call>
-  <menu_item_call label="Reset Skeleton And Animations"
-       layout="topleft"
-       name="Reset Skeleton And Animations">
-       <menu_item_call.on_click
-        function="Avatar.ResetSkeletonAndAnimations" />
-  </menu_item_call>
-
+  <menu_item_separator/>
   <menu_item_call
-    label="My Friends"
+    label="Sit / stand"
     layout="topleft"
-    name="Friends...">
+    name="Sit stand">
     <menu_item_call.on_click
-     function="SideTray.PanelPeopleTab"
-     parameter="friends_panel" />
+     function="Self.ToggleSitStand"/>
+    <menu_item_call.on_enable
+     function="Self.EnableSitStand" />
   </menu_item_call>
   <menu_item_call
-   label="My Groups"
-   layout="topleft"
-   name="Groups...">
+     label="Fly / land"
+     name="Fly land">
     <menu_item_call.on_click
-     function="SideTray.PanelPeopleTab"
-     parameter="groups_panel" />
+     function="Agent.toggleFlying" />
+    <menu_item_call.on_enable
+     function="Agent.enableFlyLand" />
   </menu_item_call>
   <menu_item_call
-    label="My Profile"
-    layout="topleft"
-    name="Profile...">
+     label="Stop animations"
+     name="Stop Animating My Avatar">
     <menu_item_call.on_click
-     function="ShowAgentProfile"
-     parameter="agent" />
+     function="Tools.StopAllAnimations" />
+  </menu_item_call>
+  <menu_item_separator/>
+  <menu_item_call label="Reset skeleton"
+       layout="topleft"
+       name="Reset Skeleton">
+       <menu_item_call.on_click
+        function="Avatar.ResetSkeleton" />
+  </menu_item_call>
+  <menu_item_call label="Reset skeleton and animations"
+       layout="topleft"
+       name="Reset Skeleton And Animations">
+       <menu_item_call.on_click
+        function="Avatar.ResetSkeletonAndAnimations" />
   </menu_item_call>
   <menu_item_call
  label="Debug Textures"
@@ -152,27 +121,13 @@ name="Edit Outfit">
             <menu_item_call.on_visible
              function="Advanced.EnableAppearanceToXML"/>
     </menu_item_call>
-  <menu_item_separator
-  layout="topleft" />
-  <menu_item_call
- enabled="false"
- label="Drop"
- layout="topleft"
- name="Drop">
-    <menu_item_call.on_click
-     function="Attachment.Drop" />
-    <menu_item_call.on_enable
-     function="Attachment.EnableDrop" />
-  </menu_item_call>
-  <menu_item_separator
-       layout="topleft" />
   <menu_item_call
      enabled="false"
      label="Block Particle Owner"
      name="Mute Particle">
     <menu_item_call.on_click
      function="Particle.Mute" />
-    <menu_item_call.on_enable
+    <menu_item_call.on_visible
      function="EnableMuteParticle" />
   </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
index f9fb847910..acbb9b860d 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -165,16 +165,13 @@
       </menu_item_call>
       </context_menu>
 
-  <menu_item_separator 
-    layout="topleft"  name="Impostor seperator"/>
-
   <menu_item_call
      enabled="false"
      label="Block Particle Owner"
      name="Mute Particle">
     <menu_item_call.on_click
      function="Particle.Mute" />
-    <menu_item_call.on_enable
+    <menu_item_call.on_visible
      function="EnableMuteParticle" />
   </menu_item_call>
 </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 9e181d0b6d..3dcafb13ef 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
@@ -3,209 +3,7 @@
  layout="topleft"
  name="Self Pie">
     <menu_item_call
-     label="Sit Down"
-     layout="topleft"
-     name="Sit Down Here">
-        <menu_item_call.on_click
-         function="Self.SitDown"
-         parameter="" />
-        <menu_item_call.on_enable
-         function="Self.EnableSitDown" />
-    </menu_item_call>
-    <menu_item_call
-     label="Stand Up"
-     layout="topleft"
-     name="Stand Up">
-        <menu_item_call.on_click
-         function="Self.StandUp"
-         parameter="" />
-        <menu_item_call.on_enable
-         function="Self.EnableStandUp" />
-    </menu_item_call>
-    <context_menu
-     label="Take Off"
-     layout="topleft"
-     name="Take Off &gt;">
-        <context_menu
-         label="Clothes"
-         layout="topleft"
-         name="Clothes &gt;">
-            <menu_item_call
-             enabled="false"
-             label="Shirt"
-             layout="topleft"
-             name="Shirt">
-                <menu_item_call.on_click
-                 function="Edit.TakeOff"
-                 parameter="shirt" />
-                <menu_item_call.on_enable
-                 function="Edit.EnableTakeOff"
-                 parameter="shirt" />
-            </menu_item_call>
-            <menu_item_call
-             enabled="false"
-             label="Pants"
-             layout="topleft"
-             name="Pants">
-                <menu_item_call.on_click
-                 function="Edit.TakeOff"
-                 parameter="pants" />
-                <menu_item_call.on_enable
-                 function="Edit.EnableTakeOff"
-                 parameter="pants" />
-            </menu_item_call>
-            <menu_item_call
-             enabled="false"
-             label="Skirt"
-             layout="topleft"
-             name="Skirt">
-                <menu_item_call.on_click
-                 function="Edit.TakeOff"
-                 parameter="skirt" />
-                <menu_item_call.on_enable
-                 function="Edit.EnableTakeOff"
-                 parameter="skirt" />
-            </menu_item_call>
-            <menu_item_call
-             enabled="false"
-             label="Shoes"
-             layout="topleft"
-             name="Shoes">
-                <menu_item_call.on_click
-                 function="Edit.TakeOff"
-                 parameter="shoes" />
-                <menu_item_call.on_enable
-                 function="Edit.EnableTakeOff"
-                 parameter="shoes" />
-            </menu_item_call>
-            <menu_item_call
-             enabled="false"
-             label="Socks"
-             layout="topleft"
-             name="Socks">
-                <menu_item_call.on_click
-                 function="Edit.TakeOff"
-                 parameter="socks" />
-                <menu_item_call.on_enable
-                 function="Edit.EnableTakeOff"
-                 parameter="socks" />
-            </menu_item_call>
-            <menu_item_call
-             enabled="false"
-             label="Jacket"
-             layout="topleft"
-             name="Jacket">
-                <menu_item_call.on_click
-                 function="Edit.TakeOff"
-                 parameter="jacket" />
-                <menu_item_call.on_enable
-                 function="Edit.EnableTakeOff"
-                 parameter="jacket" />
-            </menu_item_call>
-            <menu_item_call
-             enabled="false"
-             label="Gloves"
-             layout="topleft"
-             name="Gloves">
-                <menu_item_call.on_click
-                 function="Edit.TakeOff"
-                 parameter="gloves" />
-                <menu_item_call.on_enable
-                 function="Edit.EnableTakeOff"
-                 parameter="gloves" />
-            </menu_item_call>
-           <menu_item_call
-                 enabled="false"
-                 label="Undershirt"
-                 layout="topleft"
-                 name="Self Undershirt">
-                    <menu_item_call.on_click
-                     function="Edit.TakeOff"
-                     parameter="undershirt" />
-                    <menu_item_call.on_enable
-                     function="Edit.EnableTakeOff"
-                     parameter="undershirt" />
-                </menu_item_call>
-               <menu_item_call
-                 enabled="false"
-                 label="Underpants"
-                 layout="topleft"
-                 name="Self Underpants">
-                    <menu_item_call.on_click
-                     function="Edit.TakeOff"
-                     parameter="underpants" />
-                    <menu_item_call.on_enable
-                     function="Edit.EnableTakeOff"
-                     parameter="underpants" />
-                </menu_item_call>
-               <menu_item_call
-                 enabled="false"
-                 label="Tattoo"
-                 layout="topleft"
-                 name="Self Tattoo">
-                    <menu_item_call.on_click
-                     function="Edit.TakeOff"
-                     parameter="tattoo" />
-                    <menu_item_call.on_enable
-                     function="Edit.EnableTakeOff"
-                     parameter="tattoo" />
-                </menu_item_call>
-               <menu_item_call
-                 enabled="false"
-                 label="Physics"
-                 layout="topleft"
-                 name="Self Physics">
-                    <menu_item_call.on_click
-                     function="Edit.TakeOff"
-                     parameter="physics" />
-                    <menu_item_call.on_enable
-                     function="Edit.EnableTakeOff"
-                     parameter="physics" />
-                </menu_item_call>
-               <menu_item_call
-                 enabled="false"
-                 label="Alpha"
-                 layout="topleft"
-                 name="Self Alpha">
-                    <menu_item_call.on_click
-                     function="Edit.TakeOff"
-                     parameter="alpha" />
-                    <menu_item_call.on_enable
-                     function="Edit.EnableTakeOff"
-                     parameter="alpha" />
-                </menu_item_call>
-                <menu_item_separator
-                 layout="topleft" />
-                <menu_item_call
-                 label="All Clothes"
-                 layout="topleft"
-                 name="All Clothes">
-                    <menu_item_call.on_click
-                     function="Edit.TakeOff"
-                     parameter="all" />
-                </menu_item_call>
-        </context_menu>
-        <context_menu
-         label="HUD"
-         layout="topleft"
-         name="Object Detach HUD" />
-        <context_menu
-         label="Detach"
-         layout="topleft"
-         name="Object Detach" />
-        <menu_item_call
-         label="Detach All"
-         layout="topleft"
-         name="Detach All">
-            <menu_item_call.on_click
-             function="Self.RemoveAllAttachments"
-             parameter="" />
-            <menu_item_call.on_enable
-             function="Self.EnableRemoveAllAttachments" />
-        </menu_item_call>
-    </context_menu>
-     <menu_item_call
-     label="My Appearance"
+     label="Outfits..."
      layout="topleft"
      name="Chenge Outfit">
         <menu_item_call.on_click
@@ -213,7 +11,7 @@
         <menu_item_call.on_enable
          function="Edit.EnableCustomizeAvatar" />
     </menu_item_call>
-    <menu_item_call label="Edit My Outfit" 
+    <menu_item_call label="Edit current outfit..." 
     layout="topleft"
     name="Edit Outfit">
        <menu_item_call.on_click
@@ -221,7 +19,7 @@
        <menu_item_call.on_enable
         function="Edit.EnableCustomizeAvatar" />
    </menu_item_call>
-    <menu_item_call label="Edit My Shape" 
+    <menu_item_call label="Shape..." 
     layout="topleft"
     name="Edit My Shape">
        <menu_item_call.on_click
@@ -229,7 +27,7 @@
        <menu_item_call.on_enable
         function="Edit.EnableEditShape" />
    </menu_item_call>
-   <menu_item_call label="Hover Height"
+   <menu_item_call label="Hover height..."
      layout="topleft"
      name="Hover Height">
      <menu_item_call.on_click
@@ -237,42 +35,225 @@
      <menu_item_call.on_enable
       function="Edit.EnableHoverHeight" />
    </menu_item_call>
-   <menu_item_call label="Reset Skeleton"
+  <context_menu
+    label="Take Off"
+    layout="topleft"
+    name="Take Off &gt;">
+    <context_menu
+     label="Clothes"
+     layout="topleft"
+     name="Clothes &gt;">
+      <menu_item_call
+       enabled="false"
+       label="Shirt"
+       layout="topleft"
+       name="Shirt">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="shirt" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="shirt" />
+      </menu_item_call>
+      <menu_item_call
+       enabled="false"
+       label="Pants"
+       layout="topleft"
+       name="Pants">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="pants" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="pants" />
+      </menu_item_call>
+      <menu_item_call
+       enabled="false"
+       label="Skirt"
+       layout="topleft"
+       name="Skirt">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="skirt" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="skirt" />
+      </menu_item_call>
+      <menu_item_call
+       enabled="false"
+       label="Shoes"
+       layout="topleft"
+       name="Shoes">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="shoes" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="shoes" />
+      </menu_item_call>
+      <menu_item_call
+       enabled="false"
+       label="Socks"
+       layout="topleft"
+       name="Socks">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="socks" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="socks" />
+      </menu_item_call>
+      <menu_item_call
+       enabled="false"
+       label="Jacket"
+       layout="topleft"
+       name="Jacket">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="jacket" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="jacket" />
+      </menu_item_call>
+      <menu_item_call
+       enabled="false"
+       label="Gloves"
+       layout="topleft"
+       name="Gloves">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="gloves" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="gloves" />
+      </menu_item_call>
+      <menu_item_call
+            enabled="false"
+            label="Undershirt"
+            layout="topleft"
+            name="Self Undershirt">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="undershirt" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="undershirt" />
+      </menu_item_call>
+      <menu_item_call
+        enabled="false"
+        label="Underpants"
+        layout="topleft"
+        name="Self Underpants">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="underpants" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="underpants" />
+      </menu_item_call>
+      <menu_item_call
+        enabled="false"
+        label="Tattoo"
+        layout="topleft"
+        name="Self Tattoo">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="tattoo" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="tattoo" />
+      </menu_item_call>
+      <menu_item_call
+        enabled="false"
+        label="Physics"
+        layout="topleft"
+        name="Self Physics">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="physics" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="physics" />
+      </menu_item_call>
+      <menu_item_call
+        enabled="false"
+        label="Alpha"
+        layout="topleft"
+        name="Self Alpha">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="alpha" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="alpha" />
+      </menu_item_call>
+      <menu_item_separator
+       layout="topleft" />
+      <menu_item_call
+       label="All Clothes"
+       layout="topleft"
+       name="All Clothes">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="all" />
+      </menu_item_call>
+    </context_menu>
+    <context_menu
+     label="HUD"
+     layout="topleft"
+     name="Object Detach HUD" />
+    <context_menu
+     label="Detach"
+     layout="topleft"
+     name="Object Detach" />
+    <menu_item_call
+     label="Detach All"
+     layout="topleft"
+     name="Detach All">
+      <menu_item_call.on_click
+       function="Self.RemoveAllAttachments"
+       parameter="" />
+      <menu_item_call.on_enable
+       function="Self.EnableRemoveAllAttachments" />
+    </menu_item_call>
+  </context_menu>
+  <menu_item_separator/>
+  <menu_item_call
+    label="Sit / stand"
+    layout="topleft"
+    name="Sit stand">
+      <menu_item_call.on_click
+       function="Self.ToggleSitStand"/>
+      <menu_item_call.on_enable
+       function="Self.EnableSitStand" />
+  </menu_item_call>
+  <menu_item_call
+     label="Fly / land"
+     name="Fly land">
+      <menu_item_call.on_click
+       function="Agent.toggleFlying" />
+      <menu_item_call.on_enable
+       function="Agent.enableFlyLand" />
+  </menu_item_call>
+  <menu_item_call
+     label="Stop animations"
+     name="Stop Animating My Avatar">
+        <menu_item_call.on_click
+         function="Tools.StopAllAnimations" />
+  </menu_item_call>
+  <menu_item_separator/>
+  <menu_item_call label="Reset skeleton"
      layout="topleft"
      name="Reset Skeleton">
      <menu_item_call.on_click
       function="Avatar.ResetSkeleton" />
-   </menu_item_call>
-  <menu_item_call label="Reset Skeleton And Animations"
+  </menu_item_call>
+  <menu_item_call label="Reset skeleton and animations"
        layout="topleft"
        name="Reset Skeleton And Animations">
        <menu_item_call.on_click
         function="Avatar.ResetSkeletonAndAnimations" />
   </menu_item_call>
-   <menu_item_call
-     label="My Friends"
-     layout="topleft"
-     name="Friends...">
-        <menu_item_call.on_click
-         function="SideTray.PanelPeopleTab"
-         parameter="friends_panel" />
-    </menu_item_call>
-    <menu_item_call
-     label="My Groups"
-     layout="topleft"
-     name="Groups...">
-        <menu_item_call.on_click
-         function="SideTray.PanelPeopleTab"
-         parameter="groups_panel" />
-    </menu_item_call>
-   <menu_item_call
-     label="My Profile"
-     layout="topleft"
-     name="Profile...">
-        <menu_item_call.on_click
-         function="ShowAgentProfile"
-         parameter="agent" />
-    </menu_item_call>
     <menu_item_call
 		 label="Debug Textures"
          name="Debug...">
@@ -289,8 +270,6 @@
             <menu_item_call.on_visible
              function="Advanced.EnableAppearanceToXML"/>
     </menu_item_call>
-  <menu_item_separator
-       layout="topleft" />
   <menu_item_call
      enabled="false"
      label="Block Particle Owner"
@@ -298,7 +277,7 @@
     <menu_item_call.on_click
      function="Particle.Mute" />
 
-    <menu_item_call.on_enable
+    <menu_item_call.on_visible
      function="EnableMuteParticle" />
   </menu_item_call>
 </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 873b95926b..d81ad1c48b 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -15,24 +15,6 @@
          function="ShowAgentProfile"
          parameter="agent" />
       </menu_item_call>
-      <menu_item_call
-       label="Appearance..."
-       name="ChangeOutfit"
-       shortcut="control|O">
-        <menu_item_call.on_click
-         function="Floater.ToggleOrBringToFront"
-         parameter="appearance" />
-        <menu_item_call.on_enable
-         function="Edit.EnableCustomizeAvatar" />
-      </menu_item_call>
-      <menu_item_call
-       label="Choose an avatar..."
-       name="Avatar Picker">
-        <menu_item_call.on_click
-         function="Floater.ToggleOrBringToFront"
-         parameter="avatar" />
-      </menu_item_call>
-      <menu_item_separator/>
       <menu_item_check
          label="Inventory..."
          name="Inventory"
@@ -75,14 +57,6 @@
           function="Floater.ToggleOrBringToFront"
           parameter="experiences"/>
       </menu_item_call>
-      <menu_item_call
-        label="My Scripts..."
-        name="MyScripts">
-        <menu_item_call.on_click
-          function="Floater.ToggleOrBringToFront"
-          parameter="my_scripts"/>
-      </menu_item_call>
-      <menu_item_separator/>
       <menu_item_call
        label="Camera Controls..."
        name="Camera Controls">
@@ -90,105 +64,23 @@
          function="Floater.ToggleOrBringToFront"
          parameter="camera" />
       </menu_item_call>
-      <menu
-       create_jump_keys="true"
-       label="Movement"
-       name="Movement"
-       tear_off="true">
-        <menu_item_call
-         label="Sit Down"
-         layout="topleft"
-         shortcut="alt|shift|S"
-         name="Sit Down Here">
-          <menu_item_call.on_click
-           function="Self.SitDown"/>
-          <menu_item_call.on_visible
-           function="Self.ShowSitDown"/>
-          <menu_item_call.on_enable
-           function="Self.EnableSitDown" />
-        </menu_item_call>
-        <menu_item_call
-         label="Stand Up"
-         layout="topleft"
-         shortcut="alt|shift|S"
-         name="Stand up">
-          <menu_item_call.on_click
-           function="Self.StandUp"/>
-          <menu_item_call.on_visible
-           function="Self.EnableStandUp"/>
-          <menu_item_call.on_enable
-           function="Self.EnableStandUp" />
-        </menu_item_call>
-        <menu_item_check
-         label="Fly"
-         name="Fly"
-         shortcut="HOME">
-          <menu_item_check.on_check
-           function="Agent.getFlying" />
-          <menu_item_check.on_click
-           function="Agent.toggleFlying" />
-          <menu_item_check.on_enable
-           function="Agent.enableFlying" />
-        </menu_item_check>
-        <menu_item_call
-         label="Stop flying"
-         name="Stop flying"
-         shortcut="HOME">
-          <menu_item_call.on_click
-           function="Agent.toggleFlying" />
-          <menu_item_call.on_enable
-           function="Agent.getFlying" />
-        </menu_item_call>	
-        <menu_item_check
-         label="Always Run"
-         name="Always Run"
-         shortcut="control|R">
-          <menu_item_check.on_check
-           function="World.CheckAlwaysRun" />
-          <menu_item_check.on_click
-           function="World.AlwaysRun" />
-        </menu_item_check>
-        <menu_item_call
-         label="Stop Animating Me"
-         name="Stop Animating My Avatar">
-          <menu_item_call.on_click
-           function="Tools.StopAllAnimations" />
-        </menu_item_call>
-        <menu_item_check
-         label="Walk / run / fly..."
-         name="WalkRunFly">
-          <menu_item_check.on_check
-           function="Floater.Visible"
-           parameter="moveview" />
-          <menu_item_check.on_click
-           function="Floater.ToggleOrBringToFront"
-           parameter="moveview" />
-        </menu_item_check>
-      </menu>
-
-      <menu
-       create_jump_keys="true"
-       label="Status"
-       name="Status"
-       tear_off="true">
-        <menu_item_check
-         name="Away"
-         label="Away">
-          <menu_item_check.on_check
-           function="View.Status.CheckAway" />
-          <menu_item_check.on_click
-           function="World.SetAway" />
-        </menu_item_check>
-        <menu_item_check
-         name="Do Not Disturb"
-         label="Do Not Disturb">
-          <menu_item_check.on_check
-           function="View.Status.CheckDoNotDisturb" />
-          <menu_item_check.on_click
-           function="World.SetDoNotDisturb"/>
-        </menu_item_check>
-      
-    </menu>
+      <menu_item_separator/>
+      <menu_item_check
+       name="Away"
+       label="Away">
+        <menu_item_check.on_check
+         function="View.Status.CheckAway" />
+        <menu_item_check.on_click
+         function="World.SetAway" />
+      </menu_item_check>
+      <menu_item_check
+       name="Do Not Disturb"
+       label="Do Not Disturb">
+        <menu_item_check.on_check
+         function="View.Status.CheckDoNotDisturb" />
+        <menu_item_check.on_click
+         function="World.SetDoNotDisturb"/>
+      </menu_item_check>
 
       <menu_item_separator/>
 
@@ -258,6 +150,143 @@
              function="File.Quit" />
         </menu_item_call>
     </menu>
+    <menu
+     create_jump_keys="true"
+     label="Avatar"
+     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"
+         shortcut="control|O">
+            <menu_item_call.on_click
+             function="Floater.ToggleOrBringToFront"
+             parameter="appearance" />
+            <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">
+            <menu_item_call.on_click
+             function="HoverHeight" />
+            <menu_item_call.on_enable
+             function="Edit.EnableHoverHeight" />
+      </menu_item_call>
+      <menu_item_separator/>
+
+       <menu_item_call
+         label="Sit / stand"
+         layout="topleft"
+         shortcut="alt|shift|S"
+         name="Sit stand">
+          <menu_item_call.on_click
+           function="Self.ToggleSitStand"/>
+          <menu_item_call.on_enable
+           function="Self.EnableSitStand" />
+        </menu_item_call>
+        <menu_item_call
+         label="Fly / land"
+         name="Fly land"
+         shortcut="HOME">
+          <menu_item_call.on_click
+           function="Agent.toggleFlying" />
+          <menu_item_call.on_enable
+           function="Agent.enableFlyLand" />
+        </menu_item_call>       
+        <menu_item_call
+         label="Stop animation"
+         name="Stop Animating My Avatar">
+          <menu_item_call.on_click
+           function="Tools.StopAllAnimations" />
+        </menu_item_call>
+        <menu_item_check
+          label="Walk / run / fly..."
+          name="WalkRunFly">
+          <menu_item_check.on_check
+           function="Floater.Visible"
+           parameter="moveview" />
+          <menu_item_check.on_click
+           function="Floater.ToggleOrBringToFront"
+           parameter="moveview" />
+        </menu_item_check>
+        <menu_item_check
+          label="Always run"
+          name="Always Run"
+          shortcut="control|R">
+          <menu_item_check.on_check
+           function="World.CheckAlwaysRun" />
+          <menu_item_check.on_click
+           function="World.AlwaysRun" />
+        </menu_item_check>
+      <menu_item_separator/>
+      <menu_item_check
+       label="Gestures..."
+       name="Gestures"
+       shortcut="control|G">
+        <menu_item_check.on_check
+         function="Floater.Visible"
+         parameter="gestures" />
+        <menu_item_check.on_click
+         function="Floater.Toggle"
+         parameter="gestures" />
+      </menu_item_check>
+      <menu_item_separator/>
+      <menu_item_call 
+       label="Reset skeleton"
+       layout="topleft"
+       name="Reset Skeleton">
+        <menu_item_call.on_click
+         function="Avatar.ResetSkeleton" />
+      </menu_item_call>
+      <menu_item_call 
+       label="Reset skeleton and animations"
+       layout="topleft"
+       name="Reset Skeleton And Animations">
+        <menu_item_call.on_click
+         function="Avatar.ResetSkeletonAndAnimations" />
+      </menu_item_call>
+      <menu_item_call
+       label="Attachment scripts..."
+       name="MyScripts">
+        <menu_item_call.on_click
+         function="Floater.ToggleOrBringToFront"
+         parameter="my_scripts"/>
+      </menu_item_call>
+      <menu_item_separator/>
+      <menu_item_call
+     label="Help with avatars..."
+     name="Help with avatars">
+        <menu_item_call.on_click
+            function="Advanced.ShowURL"
+            parameter="https://community.secondlife.com/search/?q=avatar"/>
+      </menu_item_call>
+    </menu>
     <menu
      create_jump_keys="true"
      label="Communicate"
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 dc1553e6a3..85d73ece48 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -13,7 +13,7 @@
  width="333">
     <string
      name="edit_shape_title">
-        Editing Shape
+        Shape
     </string>
     <string
      name="edit_skin_title">
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 afce9f6eb5..adbeb09935 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="Edit Outfit"
+            value="Current Outfit"
             use_ellipses="true"
             width="275" />
 
-- 
cgit v1.2.3


From 05ce7511aa6ffebe78676d714a621a1fe04c66e2 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 8 Jul 2020 20:29:44 +0300
Subject: SL-13479 Avatar menu tweaks

---
 .../skins/default/xui/en/menu_attachment_self.xml  | 210 +++++++++++++++++++--
 .../skins/default/xui/en/menu_avatar_self.xml      |   2 +-
 indra/newview/skins/default/xui/en/menu_viewer.xml | 186 +++++++++++++++++-
 3 files changed, 381 insertions(+), 17 deletions(-)

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

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 03c05e6591..856bf4ce73 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -2,17 +2,6 @@
 <context_menu
  layout="topleft"
  name="Attachment Pie">
-    <menu_item_call
-     enabled="false"
-     label="Touch item"
-     layout="topleft"
-     name="Attachment Object Touch">
-        <menu_item_call.on_click
-         function="Object.Touch" />
-        <menu_item_call.on_enable
-         function="Object.EnableTouch"
-         name="EnableTouch"/>
-    </menu_item_call>
     <menu_item_call
      enabled="false"
      label="Edit item"
@@ -33,8 +22,19 @@
         <menu_item_call.on_enable
          function="Attachment.EnableDetach" />
     </menu_item_call>
-  <menu_item_separator
-    layout="topleft" />
+    <menu_item_call
+     enabled="false"
+     label="Touch item"
+     layout="topleft"
+     name="Attachment Object Touch">
+        <menu_item_call.on_click
+         function="Object.Touch" />
+        <menu_item_call.on_enable
+         function="Object.EnableTouch"
+         name="EnableTouch"/>
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
 
   <menu_item_call
   label="Outfits..."
@@ -44,7 +44,7 @@
     <menu_item_call.on_enable
      function="Edit.EnableCustomizeAvatar" />
   </menu_item_call>
-  <menu_item_call label="Edit current outfit..."
+  <menu_item_call label="Current outfit..."
 layout="topleft"
 name="Edit Outfit">
     <menu_item_call.on_click
@@ -68,6 +68,188 @@ name="Edit Outfit">
      <menu_item_call.on_enable
       function="Edit.EnableHoverHeight" />
   </menu_item_call>
+  <context_menu
+  label="Take Off"
+  layout="topleft"
+  name="Take Off &gt;">
+    <context_menu
+     label="Clothes"
+     layout="topleft"
+     name="Clothes &gt;">
+      <menu_item_call
+       enabled="false"
+       label="Shirt"
+       layout="topleft"
+       name="Shirt">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="shirt" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="shirt" />
+      </menu_item_call>
+      <menu_item_call
+       enabled="false"
+       label="Pants"
+       layout="topleft"
+       name="Pants">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="pants" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="pants" />
+      </menu_item_call>
+      <menu_item_call
+       enabled="false"
+       label="Skirt"
+       layout="topleft"
+       name="Skirt">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="skirt" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="skirt" />
+      </menu_item_call>
+      <menu_item_call
+       enabled="false"
+       label="Shoes"
+       layout="topleft"
+       name="Shoes">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="shoes" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="shoes" />
+      </menu_item_call>
+      <menu_item_call
+       enabled="false"
+       label="Socks"
+       layout="topleft"
+       name="Socks">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="socks" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="socks" />
+      </menu_item_call>
+      <menu_item_call
+       enabled="false"
+       label="Jacket"
+       layout="topleft"
+       name="Jacket">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="jacket" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="jacket" />
+      </menu_item_call>
+      <menu_item_call
+       enabled="false"
+       label="Gloves"
+       layout="topleft"
+       name="Gloves">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="gloves" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="gloves" />
+      </menu_item_call>
+      <menu_item_call
+            enabled="false"
+            label="Undershirt"
+            layout="topleft"
+            name="Self Undershirt">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="undershirt" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="undershirt" />
+      </menu_item_call>
+      <menu_item_call
+        enabled="false"
+        label="Underpants"
+        layout="topleft"
+        name="Self Underpants">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="underpants" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="underpants" />
+      </menu_item_call>
+      <menu_item_call
+        enabled="false"
+        label="Tattoo"
+        layout="topleft"
+        name="Self Tattoo">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="tattoo" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="tattoo" />
+      </menu_item_call>
+      <menu_item_call
+        enabled="false"
+        label="Physics"
+        layout="topleft"
+        name="Self Physics">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="physics" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="physics" />
+      </menu_item_call>
+      <menu_item_call
+        enabled="false"
+        label="Alpha"
+        layout="topleft"
+        name="Self Alpha">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="alpha" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="alpha" />
+      </menu_item_call>
+      <menu_item_separator
+       layout="topleft" />
+      <menu_item_call
+       label="All Clothes"
+       layout="topleft"
+       name="All Clothes">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="all" />
+      </menu_item_call>
+    </context_menu>
+    <context_menu
+     label="HUD"
+     layout="topleft"
+     name="Detach Self HUD" />
+    <context_menu
+     label="Detach"
+     layout="topleft"
+     name="Detach Self" />
+    <menu_item_call
+     label="Detach All"
+     layout="topleft"
+     name="Detach All">
+      <menu_item_call.on_click
+       function="Self.RemoveAllAttachments"
+       parameter="" />
+      <menu_item_call.on_enable
+       function="Self.EnableRemoveAllAttachments" />
+    </menu_item_call>
+  </context_menu>
   <menu_item_separator/>
   <menu_item_call
     label="Sit / stand"
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 3dcafb13ef..a46d9aed55 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
@@ -11,7 +11,7 @@
         <menu_item_call.on_enable
          function="Edit.EnableCustomizeAvatar" />
     </menu_item_call>
-    <menu_item_call label="Edit current outfit..." 
+    <menu_item_call label="Current outfit..." 
     layout="topleft"
     name="Edit Outfit">
        <menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index d81ad1c48b..02e078c584 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -198,6 +198,188 @@
             <menu_item_call.on_enable
              function="Edit.EnableHoverHeight" />
       </menu_item_call>
+      <menu
+        label="Take Off"
+        layout="topleft"
+        name="Take Off &gt;">
+        <menu
+         label="Clothes"
+         layout="topleft"
+         name="Clothes &gt;">
+          <menu_item_call
+           enabled="false"
+           label="Shirt"
+           layout="topleft"
+           name="Shirt">
+            <menu_item_call.on_click
+             function="Edit.TakeOff"
+             parameter="shirt" />
+            <menu_item_call.on_enable
+             function="Edit.EnableTakeOff"
+             parameter="shirt" />
+          </menu_item_call>
+          <menu_item_call
+           enabled="false"
+           label="Pants"
+           layout="topleft"
+           name="Pants">
+            <menu_item_call.on_click
+             function="Edit.TakeOff"
+             parameter="pants" />
+            <menu_item_call.on_enable
+             function="Edit.EnableTakeOff"
+             parameter="pants" />
+          </menu_item_call>
+          <menu_item_call
+           enabled="false"
+           label="Skirt"
+           layout="topleft"
+           name="Skirt">
+            <menu_item_call.on_click
+             function="Edit.TakeOff"
+             parameter="skirt" />
+            <menu_item_call.on_enable
+             function="Edit.EnableTakeOff"
+             parameter="skirt" />
+          </menu_item_call>
+          <menu_item_call
+           enabled="false"
+           label="Shoes"
+           layout="topleft"
+           name="Shoes">
+            <menu_item_call.on_click
+             function="Edit.TakeOff"
+             parameter="shoes" />
+            <menu_item_call.on_enable
+             function="Edit.EnableTakeOff"
+             parameter="shoes" />
+          </menu_item_call>
+          <menu_item_call
+           enabled="false"
+           label="Socks"
+           layout="topleft"
+           name="Socks">
+            <menu_item_call.on_click
+             function="Edit.TakeOff"
+             parameter="socks" />
+            <menu_item_call.on_enable
+             function="Edit.EnableTakeOff"
+             parameter="socks" />
+          </menu_item_call>
+          <menu_item_call
+           enabled="false"
+           label="Jacket"
+           layout="topleft"
+           name="Jacket">
+            <menu_item_call.on_click
+             function="Edit.TakeOff"
+             parameter="jacket" />
+            <menu_item_call.on_enable
+             function="Edit.EnableTakeOff"
+             parameter="jacket" />
+          </menu_item_call>
+          <menu_item_call
+           enabled="false"
+           label="Gloves"
+           layout="topleft"
+           name="Gloves">
+            <menu_item_call.on_click
+             function="Edit.TakeOff"
+             parameter="gloves" />
+            <menu_item_call.on_enable
+             function="Edit.EnableTakeOff"
+             parameter="gloves" />
+          </menu_item_call>
+          <menu_item_call
+                enabled="false"
+                label="Undershirt"
+                layout="topleft"
+                name="Self Undershirt">
+            <menu_item_call.on_click
+             function="Edit.TakeOff"
+             parameter="undershirt" />
+            <menu_item_call.on_enable
+             function="Edit.EnableTakeOff"
+             parameter="undershirt" />
+          </menu_item_call>
+          <menu_item_call
+            enabled="false"
+            label="Underpants"
+            layout="topleft"
+            name="Self Underpants">
+            <menu_item_call.on_click
+             function="Edit.TakeOff"
+             parameter="underpants" />
+            <menu_item_call.on_enable
+             function="Edit.EnableTakeOff"
+             parameter="underpants" />
+          </menu_item_call>
+          <menu_item_call
+            enabled="false"
+            label="Tattoo"
+            layout="topleft"
+            name="Self Tattoo">
+            <menu_item_call.on_click
+             function="Edit.TakeOff"
+             parameter="tattoo" />
+            <menu_item_call.on_enable
+             function="Edit.EnableTakeOff"
+             parameter="tattoo" />
+          </menu_item_call>
+          <menu_item_call
+            enabled="false"
+            label="Physics"
+            layout="topleft"
+            name="Self Physics">
+            <menu_item_call.on_click
+             function="Edit.TakeOff"
+             parameter="physics" />
+            <menu_item_call.on_enable
+             function="Edit.EnableTakeOff"
+             parameter="physics" />
+          </menu_item_call>
+          <menu_item_call
+            enabled="false"
+            label="Alpha"
+            layout="topleft"
+            name="Self Alpha">
+            <menu_item_call.on_click
+             function="Edit.TakeOff"
+             parameter="alpha" />
+            <menu_item_call.on_enable
+             function="Edit.EnableTakeOff"
+             parameter="alpha" />
+          </menu_item_call>
+          <menu_item_separator
+           layout="topleft" />
+          <menu_item_call
+           label="All Clothes"
+           layout="topleft"
+           name="All Clothes">
+            <menu_item_call.on_click
+             function="Edit.TakeOff"
+             parameter="all" />
+          </menu_item_call>
+        </menu>
+        <menu
+         label="HUD"
+         layout="topleft"
+         name="Avatar Detach HUD" />
+        <menu
+         label="Detach"
+         layout="topleft"
+         name="Avatar Detach" />
+        <menu_item_call
+         label="Detach All"
+         layout="topleft"
+         name="Detach All">
+          <menu_item_call.on_click
+           function="Self.RemoveAllAttachments"
+           parameter="" />
+          <menu_item_call.on_enable
+           function="Self.EnableRemoveAllAttachments" />
+        </menu_item_call>
+      </menu>
       <menu_item_separator/>
 
        <menu_item_call
@@ -220,7 +402,7 @@
            function="Agent.enableFlyLand" />
         </menu_item_call>       
         <menu_item_call
-         label="Stop animation"
+         label="Stop animations"
          name="Stop Animating My Avatar">
           <menu_item_call.on_click
            function="Tools.StopAllAnimations" />
@@ -284,7 +466,7 @@
      name="Help with avatars">
         <menu_item_call.on_click
             function="Advanced.ShowURL"
-            parameter="https://community.secondlife.com/search/?q=avatar"/>
+            parameter="https://community.secondlife.com/search/?type=cms_records3&amp;tags=avatar&amp;nodes=30&amp;search_and_or=or"/>
       </menu_item_call>
     </menu>
     <menu
-- 
cgit v1.2.3


From 8bc8b1cfd68bb088eac881853b41a5b4159e22c9 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 9 Jul 2020 14:20:11 +0300
Subject: SL-13093 Add time info to the Date column in group notices

---
 indra/newview/skins/default/xui/en/panel_group_notices.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
index 47aceb2c2e..d734249129 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -59,7 +59,7 @@ Maximum 200 per group daily
         <scroll_list.columns
          label="Date"
          name="date"
-         width="60" />
+         width="100" />
         <scroll_list.columns
          name="sort"
          width="-1" />
-- 
cgit v1.2.3


From 0fbe4cf62a236ea24f383818bf81b933f87380d8 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 9 Jul 2020 23:59:38 +0300
Subject: SL-5894 #2 WIP Changes to display multiple joystick devices

---
 .../skins/default/xui/en/floater_joystick.xml      | 165 +++++++++++----------
 1 file changed, 85 insertions(+), 80 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_joystick.xml b/indra/newview/skins/default/xui/en/floater_joystick.xml
index 3dfdf8e1a5..7d2cea1fe5 100644
--- a/indra/newview/skins/default/xui/en/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/en/floater_joystick.xml
@@ -8,27 +8,32 @@
  title="JOYSTICK CONFIGURATION"
  width="569">
     <floater.string
-     name="NoDevice">
-        no device detected
+     name="JoystickDisabled">
+        None
     </floater.string>
-    <check_box
-     bottom="38"
-     height="10"
-     control_name="JoystickEnabled"
-     halign="left"
-     label="Enable Joystick:"
+    <text
+     type="string"
      layout="topleft"
+     follows="left|top"
+     halign="left"
+     height="12"
+     top="22"
      left="14"
-     name="enable_joystick"
-     width="60" />
-    <text
-     bottom="32"
+     width="50"
+     mouse_opaque="false"
+     name="joystick_lbl">
+      Joystick:
+    </text>
+    <combo_box
+     allow_text_entry="false"
+     follows="left|top"
      layout="topleft"
-     left="120"
-     name="joystick_type"
-     width="380" />
+     name="joystick_combo"
+     top="19"
+     left_pad="4"
+     width="300"/>
     <spinner
-     bottom="48"
+     bottom="56"
      height="10"
      control_name="JoystickAxis1"
      decimal_digits="0"
@@ -42,7 +47,7 @@
      name="JoystickAxis1"
      width="140" />
     <spinner
-     bottom="48"
+     bottom_delta="0"
      height="10"     
      control_name="JoystickAxis2"
      decimal_digits="0"
@@ -56,7 +61,7 @@
      name="JoystickAxis2"
      width="140" />
     <spinner
-     bottom="48"
+     bottom_delta="0"
      height="10"     
      control_name="JoystickAxis0"
      decimal_digits="0"
@@ -70,7 +75,7 @@
      name="JoystickAxis0"
      width="140" />
     <spinner
-     bottom="68"
+     bottom="76"
      height="10"     
      control_name="JoystickAxis4"
      decimal_digits="0"
@@ -84,7 +89,7 @@
      name="JoystickAxis4"
      width="140" />
     <spinner
-     bottom="68"
+     bottom_delta="0"
      height="10"     
      control_name="JoystickAxis5"
      decimal_digits="0"
@@ -98,7 +103,7 @@
      name="JoystickAxis5"
      width="140" />
     <spinner
-     bottom="68"
+     bottom_delta="0"
      height="10"     
      control_name="JoystickAxis3"
      decimal_digits="0"
@@ -112,7 +117,7 @@
      name="JoystickAxis3"
      width="140" />
     <spinner
-     bottom="88"
+     bottom="96"
      height="10"     
      control_name="JoystickAxis6"
      decimal_digits="0"
@@ -162,12 +167,12 @@
      left="37"
      mouse_opaque="false"
      name="Control Modes:"
-     top="110"
+     top="118"
      width="102">
         Control Modes:
     </text>
     <check_box
-     bottom="127"
+     bottom="134"
      height="10"     
      control_name="JoystickAvatarEnabled"
      halign="center"
@@ -177,7 +182,7 @@
      name="JoystickAvatarEnabled"
      width="60" />
     <check_box
-     bottom="127"
+     bottom_delta="0"
      height="10"     
      control_name="JoystickBuildEnabled"
      halign="center"
@@ -187,7 +192,7 @@
      name="JoystickBuildEnabled"
      width="60" />
     <check_box
-     bottom="127"
+     bottom_delta="0"
      height="10"     
      control_name="JoystickFlycamEnabled"
      halign="center"
@@ -203,7 +208,7 @@
      left="359"
      name="axis_view"
      show_label="true"
-     top="135"
+     top="143"
      width="200">
         <stat_bar
          bar_max="2"
@@ -266,7 +271,7 @@
     <text
      type="string"
      length="1"
-     bottom="144"
+     bottom="152"
      halign="right"
      layout="topleft"
      left="3"
@@ -275,7 +280,7 @@
         X Scale
     </text>
     <spinner
-     bottom="144"
+     bottom_delta="0"
      height="10"     
      control_name="AvatarAxisScale1"
      decimal_digits="2"
@@ -287,7 +292,7 @@
      name="AvatarAxisScale1"
      width="56" />
     <spinner
-     bottom="144"
+     bottom_delta="0"
      height="10"     
      control_name="BuildAxisScale1"
      decimal_digits="2"
@@ -299,7 +304,7 @@
      name="BuildAxisScale1"
      width="56" />
     <spinner
-     bottom="144"
+     bottom_delta="0"
      height="10"     
      control_name="FlycamAxisScale1"
      decimal_digits="2"
@@ -313,7 +318,7 @@
     <text
      type="string"
      length="1"
-     bottom="164"
+     bottom="172"
      halign="right"
      layout="topleft"
      left="3"
@@ -322,7 +327,7 @@
         Y Scale
     </text>
     <spinner
-     bottom="164"
+     bottom_delta="0"
      height="10"     
      control_name="AvatarAxisScale2"
      decimal_digits="2"
@@ -334,7 +339,7 @@
      name="AvatarAxisScale2"
      width="56" />
     <spinner
-     bottom="164"
+     bottom_delta="0"
      height="10"     
      control_name="BuildAxisScale2"
      decimal_digits="2"
@@ -346,7 +351,7 @@
      name="BuildAxisScale2"
      width="56" />
     <spinner
-     bottom="164"
+     bottom_delta="0"
      height="10"     
      control_name="FlycamAxisScale2"
      decimal_digits="2"
@@ -360,7 +365,7 @@
     <text
      type="string"
      length="1"
-     bottom="184"
+     bottom="192"
      halign="right"
      layout="topleft"
      left="3"
@@ -369,7 +374,7 @@
         Z Scale
     </text>
     <spinner
-     bottom="184"
+     bottom_delta="0"
      height="10"     
      control_name="AvatarAxisScale0"
      decimal_digits="2"
@@ -381,7 +386,7 @@
      name="AvatarAxisScale0"
      width="56" />
     <spinner
-     bottom="184"
+     bottom_delta="0"
      height="10"     
      control_name="BuildAxisScale0"
      decimal_digits="2"
@@ -393,7 +398,7 @@
      name="BuildAxisScale0"
      width="56" />
     <spinner
-     bottom="184"
+     bottom_delta="0"
      height="10"     
      control_name="FlycamAxisScale0"
      decimal_digits="2"
@@ -407,7 +412,7 @@
     <text
      type="string"
      length="1"
-     bottom="204"
+     bottom="212"
      halign="right"
      layout="topleft"
      left="3"
@@ -416,7 +421,7 @@
         Pitch Scale
     </text>
     <spinner
-     bottom="204"
+     bottom_delta="0"
      height="10"     
      control_name="AvatarAxisScale4"
      decimal_digits="2"
@@ -428,7 +433,7 @@
      name="AvatarAxisScale4"
      width="56" />
     <spinner
-     bottom="204"
+     bottom_delta="0"
      height="10"     
      control_name="BuildAxisScale4"
      decimal_digits="2"
@@ -440,7 +445,7 @@
      name="BuildAxisScale4"
      width="56" />
     <spinner
-     bottom="204"
+     bottom_delta="0"
      height="10"     
      control_name="FlycamAxisScale4"
      decimal_digits="2"
@@ -454,7 +459,7 @@
     <text
      type="string"
      length="1"
-     bottom="224"
+     bottom="232"
      halign="right"
      layout="topleft"
      left="3"
@@ -463,7 +468,7 @@
         Yaw Scale
     </text>
     <spinner
-     bottom="224"
+     bottom_delta="0"
      height="10"
      control_name="AvatarAxisScale5"
      decimal_digits="2"
@@ -475,7 +480,7 @@
      name="AvatarAxisScale5"
      width="56" />
     <spinner
-     bottom="224"
+     bottom_delta="0"
      height="10"
      control_name="BuildAxisScale5"
      decimal_digits="2"
@@ -487,7 +492,7 @@
      name="BuildAxisScale5"
      width="56" />
     <spinner
-     bottom="224"
+     bottom_delta="0"
      height="10"
      control_name="FlycamAxisScale5"
      decimal_digits="2"
@@ -501,7 +506,7 @@
     <text
      type="string"
      length="1"
-     bottom="244"
+     bottom="252"
      halign="right"
      layout="topleft"
      left="3"
@@ -510,7 +515,7 @@
         Roll Scale
     </text>
     <spinner
-     bottom="244"
+     bottom_delta="0"
      height="10"
      control_name="BuildAxisScale3"
      decimal_digits="2"
@@ -522,7 +527,7 @@
      name="BuildAxisScale3"
      width="56" />
     <spinner
-     bottom="244"
+     bottom_delta="0"
      height="10"
      control_name="FlycamAxisScale3"
      decimal_digits="2"
@@ -536,7 +541,7 @@
     <text
      type="string"
      length="1"
-     bottom="274"
+     bottom="282"
      halign="right"
      layout="topleft"
      left="3"
@@ -545,7 +550,7 @@
         X Dead Zone
     </text>
     <spinner
-     bottom="274"
+     bottom_delta="0"
      height="10"
      control_name="AvatarAxisDeadZone1"
      decimal_digits="2"
@@ -556,7 +561,7 @@
      name="AvatarAxisDeadZone1"
      width="56" />
     <spinner
-     bottom="274"
+     bottom_delta="0"
      height="10"
      control_name="BuildAxisDeadZone1"
      decimal_digits="2"
@@ -567,7 +572,7 @@
      name="BuildAxisDeadZone1"
      width="56" />
     <spinner
-     bottom="274"
+     bottom_delta="0"
      height="10"
      control_name="FlycamAxisDeadZone1"
      decimal_digits="2"
@@ -580,7 +585,7 @@
     <text
      type="string"
      length="1"
-     bottom="294"
+     bottom="302"
      halign="right"
      layout="topleft"
      left="3"
@@ -589,7 +594,7 @@
         Y Dead Zone
     </text>
     <spinner
-     bottom="294"
+     bottom_delta="0"
      height="10"     
      control_name="AvatarAxisDeadZone2"
      decimal_digits="2"
@@ -600,7 +605,7 @@
      name="AvatarAxisDeadZone2"
      width="56" />
     <spinner
-     bottom="294"
+     bottom_delta="0"
      height="10"
      control_name="BuildAxisDeadZone2"
      decimal_digits="2"
@@ -611,7 +616,7 @@
      name="BuildAxisDeadZone2"
      width="56" />
     <spinner
-     bottom="294"
+     bottom_delta="0"
      height="10"
      control_name="FlycamAxisDeadZone2"
      decimal_digits="2"
@@ -624,7 +629,7 @@
     <text
      type="string"
      length="1"
-     bottom="314"
+     bottom="322"
      halign="right"
      layout="topleft"
      left="3"
@@ -633,7 +638,7 @@
         Z Dead Zone
     </text>
     <spinner
-     bottom="314"
+     bottom_delta="0"
      height="10"
      control_name="AvatarAxisDeadZone0"
      decimal_digits="2"
@@ -644,7 +649,7 @@
      name="AvatarAxisDeadZone0"
      width="56" />
     <spinner
-     bottom="314"
+     bottom_delta="0"
      height="10"
      control_name="BuildAxisDeadZone0"
      decimal_digits="2"
@@ -655,7 +660,7 @@
      name="BuildAxisDeadZone0"
      width="56" />
     <spinner
-     bottom="314"
+     bottom_delta="0"
      height="10"
      control_name="FlycamAxisDeadZone0"
      decimal_digits="2"
@@ -668,7 +673,7 @@
     <text
      type="string"
      length="1"
-     bottom="334"
+     bottom="342"
      halign="right"
      layout="topleft"
      left="2"
@@ -677,7 +682,7 @@
         Pitch Dead Zone
     </text>
     <spinner
-     bottom="334"
+     bottom_delta="0"
      height="10"
      control_name="AvatarAxisDeadZone4"
      decimal_digits="2"
@@ -688,7 +693,7 @@
      name="AvatarAxisDeadZone4"
      width="56" />
     <spinner
-     bottom="334"
+     bottom_delta="0"
      height="10"
      control_name="BuildAxisDeadZone4"
      decimal_digits="2"
@@ -699,7 +704,7 @@
      name="BuildAxisDeadZone4"
      width="56" />
     <spinner
-     bottom="334"
+     bottom_delta="0"
      height="10"
      control_name="FlycamAxisDeadZone4"
      decimal_digits="2"
@@ -712,7 +717,7 @@
     <text
      type="string"
      length="1"
-     bottom="354"
+     bottom="362"
      halign="right"
      layout="topleft"
      left="3"
@@ -721,7 +726,7 @@
         Yaw Dead Zone
     </text>
     <spinner
-     bottom="354"
+     bottom_delta="0"
      height="10"
      control_name="AvatarAxisDeadZone5"
      decimal_digits="2"
@@ -732,7 +737,7 @@
      name="AvatarAxisDeadZone5"
      width="56" />
     <spinner
-     bottom="354"
+     bottom_delta="0"
      height="10"
      control_name="BuildAxisDeadZone5"
      decimal_digits="2"
@@ -743,7 +748,7 @@
      name="BuildAxisDeadZone5"
      width="56" />
     <spinner
-     bottom="354"
+     bottom_delta="0"
      height="10"
      control_name="FlycamAxisDeadZone5"
      decimal_digits="2"
@@ -756,7 +761,7 @@
     <text
      type="string"
      length="1"
-     bottom="374"
+     bottom="382"
      halign="right"
      layout="topleft"
      left="3"
@@ -765,7 +770,7 @@
         Roll Dead Zone
     </text>
     <spinner
-     bottom="374"
+     bottom_delta="0"
      height="10"
      control_name="BuildAxisDeadZone3"
      decimal_digits="2"
@@ -776,7 +781,7 @@
      name="BuildAxisDeadZone3"
      width="56" />
     <spinner
-     bottom="374"
+     bottom_delta="0"
      height="10"
      control_name="FlycamAxisDeadZone3"
      decimal_digits="2"
@@ -789,7 +794,7 @@
     <text
      type="string"
      length="1"
-     bottom="402"
+     bottom="410"
      halign="right"
      layout="topleft"
      left="3"
@@ -810,7 +815,7 @@
      min_val="1"
      name="AvatarFeathering"
      show_text="false"
-     top="402"
+     top="410"
      width="73" />
     <slider
      control_name="BuildFeathering"
@@ -845,7 +850,7 @@
     <text
      type="string"
      length="1"
-     bottom="430"
+     bottom="438"
      halign="right"
      layout="topleft"
      left="3"
@@ -854,7 +859,7 @@
         Zoom Scale
     </text>
     <spinner
-     bottom="430"
+     bottom_delta="0"
      height="10"
      control_name="FlycamAxisScale6"
      decimal_digits="2"
@@ -868,7 +873,7 @@
     <text
      type="string"
      length="1"
-     bottom="450"
+     bottom="458"
      halign="right"
      layout="topleft"
      left="3"
@@ -877,7 +882,7 @@
         Zoom Dead Zone
     </text>
     <spinner
-     bottom="450"
+     bottom_delta="0"
      height="10"
      control_name="FlycamAxisDeadZone6"
      decimal_digits="2"
@@ -894,7 +899,7 @@
      layout="topleft"
      left="359"
      name="SpaceNavigatorDefaults"
-     top="429"
+     top="437"
      width="200" />
     <button
      follows="right|bottom"
-- 
cgit v1.2.3


From ad3f7252229e476f6e85f7b5d274aa6ee362fce1 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 15 Jul 2020 18:35:59 +0300
Subject: SL-13612 Dedicated Avatar menu -- Revise toolbar button labels

---
 indra/newview/skins/default/xui/en/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 1bfac6aeb7..1995cb1ee0 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4102,8 +4102,8 @@ Try enclosing path to the editor with double quotes.
   <!-- commands -->
 
   <string name="Command_AboutLand_Label">About land</string>
-  <string name="Command_Appearance_Label">Appearance</string>
-  <string name="Command_Avatar_Label">Avatar</string>
+  <string name="Command_Appearance_Label">Outfits</string>
+  <string name="Command_Avatar_Label">Complete avatars</string>
   <string name="Command_Build_Label">Build</string>
   <string name="Command_Chat_Label">Chat</string>
   <string name="Command_Conversations_Label">Conversations</string>
-- 
cgit v1.2.3


From 90978393950cfdd544c215ae0fea43669cc6c2b5 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 23 Jul 2020 16:54:55 +0300
Subject: SL-13648 FIXED Issue with group notice date sorting

---
 indra/newview/skins/default/xui/en/panel_group_notices.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
index d734249129..a5aca5c72b 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -59,6 +59,7 @@ Maximum 200 per group daily
         <scroll_list.columns
          label="Date"
          name="date"
+         sort_column="sort"
          width="100" />
         <scroll_list.columns
          name="sort"
-- 
cgit v1.2.3


From 61e27e0f6c333af6f83705492b7c0d176912f986 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 23 Oct 2020 21:13:18 +0300
Subject: SL-14050 remove references to viewer-help

---
 indra/newview/skins/default/xui/en/panel_script_ed.xml | 4 ----
 1 file changed, 4 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
index ed37e9e2cc..545c01935b 100644
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -144,10 +144,6 @@
       mouse_opaque="false"
       name="Help"
       width="112">
-      <menu_item_call
-        label="Help..."
-        layout="topleft"
-        name="Help..." />
       <menu_item_call
         label="Keyword Help..."
         layout="topleft"
-- 
cgit v1.2.3


From 674f12f681c4b405400194a35496a8e1ff77b3e5 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Thu, 12 Nov 2020 11:20:58 +0200
Subject: SL-13278 Restored missing properties

---
 indra/newview/skins/default/xui/en/menu_wearable_list_item.xml | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
index 67d4515e3c..46b8b042d5 100644
--- a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
@@ -29,12 +29,14 @@
      label="Touch"
      layout="topleft"
      name="touch"
+     visible="false"
      on_click.function="Attachment.Touch"
      />
     <menu_item_call
      label="Edit"
      layout="topleft"
      name="edit"
+     visible="false"
      on_click.function="Wearable.Edit"
      />
     <menu_item_call
-- 
cgit v1.2.3


From 7b7667973b3ecaa857f1013c8084f3159105eec1 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 23 Nov 2020 14:29:07 +0200
Subject: DRTVWR-513 Resolved merge conflict from merge with DRTVWR-507

See changes from SL-13119 and SL-13190
---
 indra/newview/skins/default/xui/en/menu_wearable_list_item.xml | 8 --------
 1 file changed, 8 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
index 46b8b042d5..20c81c983b 100644
--- a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
@@ -71,14 +71,6 @@
         <on_click
          function="Clothing.TakeOff" />
     </menu_item_call>
-    <menu_item_call
-     label="Edit"
-     layout="topleft"
-     visible="false"
-     name="edit">
-        <on_click
-         function="Wearable.Edit" />
-    </menu_item_call>
     <menu_item_call
      label="Item Profile"
      layout="topleft"
-- 
cgit v1.2.3


From 3efc4f5a4f4250bb56a511172d87606304fb85ed Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 23 Nov 2020 19:50:17 +0200
Subject: SL-14370 Don't init inventory views if they aren't needed

These views are 'heavy' and rarely used, don't init them all the time.
---
 indra/newview/skins/default/xui/en/panel_outfit_edit.xml | 1 +
 1 file changed, 1 insertion(+)

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

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 adbeb09935..6fd54d7c6a 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -321,6 +321,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
                     name="folder_view"
                     top_pad="0"
                     width="313"
+                    preinitialize_views="false"
                     visible="false"/>
             <panel name="filtered_wearables_panel"
                     background_opaque="true"
-- 
cgit v1.2.3


From 4544dca57c84f2e9176fda14f55ef0f724eada8c Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Tue, 24 Nov 2020 04:19:33 +0200
Subject: Revert "SL-13612 Dedicated Avatar menu -- Revise toolbar button
 labels"

This reverts commit ad3f7252229e476f6e85f7b5d274aa6ee362fce1.
---
 indra/newview/skins/default/xui/en/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 81390447e9..f9f12e7f5c 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4104,8 +4104,8 @@ Try enclosing path to the editor with double quotes.
   <!-- commands -->
 
   <string name="Command_AboutLand_Label">About land</string>
-  <string name="Command_Appearance_Label">Outfits</string>
-  <string name="Command_Avatar_Label">Complete avatars</string>
+  <string name="Command_Appearance_Label">Appearance</string>
+  <string name="Command_Avatar_Label">Avatar</string>
   <string name="Command_Build_Label">Build</string>
   <string name="Command_Chat_Label">Chat</string>
   <string name="Command_Conversations_Label">Conversations</string>
-- 
cgit v1.2.3


From 7f236cd2ae79423af4fa192f4cb113b023f00984 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Tue, 24 Nov 2020 04:20:06 +0200
Subject: Revert "SL-13479 Avatar menu tweaks"

This reverts commit 05ce7511aa6ffebe78676d714a621a1fe04c66e2.
---
 .../skins/default/xui/en/menu_attachment_self.xml  | 210 ++-------------------
 .../skins/default/xui/en/menu_avatar_self.xml      |   2 +-
 indra/newview/skins/default/xui/en/menu_viewer.xml | 186 +-----------------
 3 files changed, 17 insertions(+), 381 deletions(-)

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

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..03c05e6591 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -2,6 +2,17 @@
 <context_menu
  layout="topleft"
  name="Attachment Pie">
+    <menu_item_call
+     enabled="false"
+     label="Touch item"
+     layout="topleft"
+     name="Attachment Object Touch">
+        <menu_item_call.on_click
+         function="Object.Touch" />
+        <menu_item_call.on_enable
+         function="Object.EnableTouch"
+         name="EnableTouch"/>
+    </menu_item_call>
     <menu_item_call
      enabled="false"
      label="Edit item"
@@ -22,19 +33,8 @@
         <menu_item_call.on_enable
          function="Attachment.EnableDetach" />
     </menu_item_call>
-    <menu_item_call
-     enabled="false"
-     label="Touch item"
-     layout="topleft"
-     name="Attachment Object Touch">
-        <menu_item_call.on_click
-         function="Object.Touch" />
-        <menu_item_call.on_enable
-         function="Object.EnableTouch"
-         name="EnableTouch"/>
-    </menu_item_call>
-    <menu_item_separator
-     layout="topleft" />
+  <menu_item_separator
+    layout="topleft" />
 
   <menu_item_call
   label="Outfits..."
@@ -44,7 +44,7 @@
     <menu_item_call.on_enable
      function="Edit.EnableCustomizeAvatar" />
   </menu_item_call>
-  <menu_item_call label="Current outfit..."
+  <menu_item_call label="Edit current outfit..."
 layout="topleft"
 name="Edit Outfit">
     <menu_item_call.on_click
@@ -68,188 +68,6 @@ name="Edit Outfit">
      <menu_item_call.on_enable
       function="Edit.EnableHoverHeight" />
   </menu_item_call>
-  <context_menu
-  label="Take Off"
-  layout="topleft"
-  name="Take Off &gt;">
-    <context_menu
-     label="Clothes"
-     layout="topleft"
-     name="Clothes &gt;">
-      <menu_item_call
-       enabled="false"
-       label="Shirt"
-       layout="topleft"
-       name="Shirt">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="shirt" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="shirt" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Pants"
-       layout="topleft"
-       name="Pants">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="pants" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="pants" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Skirt"
-       layout="topleft"
-       name="Skirt">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="skirt" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="skirt" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Shoes"
-       layout="topleft"
-       name="Shoes">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="shoes" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="shoes" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Socks"
-       layout="topleft"
-       name="Socks">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="socks" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="socks" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Jacket"
-       layout="topleft"
-       name="Jacket">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="jacket" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="jacket" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Gloves"
-       layout="topleft"
-       name="Gloves">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="gloves" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="gloves" />
-      </menu_item_call>
-      <menu_item_call
-            enabled="false"
-            label="Undershirt"
-            layout="topleft"
-            name="Self Undershirt">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="undershirt" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="undershirt" />
-      </menu_item_call>
-      <menu_item_call
-        enabled="false"
-        label="Underpants"
-        layout="topleft"
-        name="Self Underpants">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="underpants" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="underpants" />
-      </menu_item_call>
-      <menu_item_call
-        enabled="false"
-        label="Tattoo"
-        layout="topleft"
-        name="Self Tattoo">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="tattoo" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="tattoo" />
-      </menu_item_call>
-      <menu_item_call
-        enabled="false"
-        label="Physics"
-        layout="topleft"
-        name="Self Physics">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="physics" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="physics" />
-      </menu_item_call>
-      <menu_item_call
-        enabled="false"
-        label="Alpha"
-        layout="topleft"
-        name="Self Alpha">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="alpha" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="alpha" />
-      </menu_item_call>
-      <menu_item_separator
-       layout="topleft" />
-      <menu_item_call
-       label="All Clothes"
-       layout="topleft"
-       name="All Clothes">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="all" />
-      </menu_item_call>
-    </context_menu>
-    <context_menu
-     label="HUD"
-     layout="topleft"
-     name="Detach Self HUD" />
-    <context_menu
-     label="Detach"
-     layout="topleft"
-     name="Detach Self" />
-    <menu_item_call
-     label="Detach All"
-     layout="topleft"
-     name="Detach All">
-      <menu_item_call.on_click
-       function="Self.RemoveAllAttachments"
-       parameter="" />
-      <menu_item_call.on_enable
-       function="Self.EnableRemoveAllAttachments" />
-    </menu_item_call>
-  </context_menu>
   <menu_item_separator/>
   <menu_item_call
     label="Sit / stand"
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..3dcafb13ef 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
@@ -11,7 +11,7 @@
         <menu_item_call.on_enable
          function="Edit.EnableCustomizeAvatar" />
     </menu_item_call>
-    <menu_item_call label="Current outfit..." 
+    <menu_item_call label="Edit current outfit..." 
     layout="topleft"
     name="Edit Outfit">
        <menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 270e267fd4..eb9471e300 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -198,188 +198,6 @@
             <menu_item_call.on_enable
              function="Edit.EnableHoverHeight" />
       </menu_item_call>
-      <menu
-        label="Take Off"
-        layout="topleft"
-        name="Take Off &gt;">
-        <menu
-         label="Clothes"
-         layout="topleft"
-         name="Clothes &gt;">
-          <menu_item_call
-           enabled="false"
-           label="Shirt"
-           layout="topleft"
-           name="Shirt">
-            <menu_item_call.on_click
-             function="Edit.TakeOff"
-             parameter="shirt" />
-            <menu_item_call.on_enable
-             function="Edit.EnableTakeOff"
-             parameter="shirt" />
-          </menu_item_call>
-          <menu_item_call
-           enabled="false"
-           label="Pants"
-           layout="topleft"
-           name="Pants">
-            <menu_item_call.on_click
-             function="Edit.TakeOff"
-             parameter="pants" />
-            <menu_item_call.on_enable
-             function="Edit.EnableTakeOff"
-             parameter="pants" />
-          </menu_item_call>
-          <menu_item_call
-           enabled="false"
-           label="Skirt"
-           layout="topleft"
-           name="Skirt">
-            <menu_item_call.on_click
-             function="Edit.TakeOff"
-             parameter="skirt" />
-            <menu_item_call.on_enable
-             function="Edit.EnableTakeOff"
-             parameter="skirt" />
-          </menu_item_call>
-          <menu_item_call
-           enabled="false"
-           label="Shoes"
-           layout="topleft"
-           name="Shoes">
-            <menu_item_call.on_click
-             function="Edit.TakeOff"
-             parameter="shoes" />
-            <menu_item_call.on_enable
-             function="Edit.EnableTakeOff"
-             parameter="shoes" />
-          </menu_item_call>
-          <menu_item_call
-           enabled="false"
-           label="Socks"
-           layout="topleft"
-           name="Socks">
-            <menu_item_call.on_click
-             function="Edit.TakeOff"
-             parameter="socks" />
-            <menu_item_call.on_enable
-             function="Edit.EnableTakeOff"
-             parameter="socks" />
-          </menu_item_call>
-          <menu_item_call
-           enabled="false"
-           label="Jacket"
-           layout="topleft"
-           name="Jacket">
-            <menu_item_call.on_click
-             function="Edit.TakeOff"
-             parameter="jacket" />
-            <menu_item_call.on_enable
-             function="Edit.EnableTakeOff"
-             parameter="jacket" />
-          </menu_item_call>
-          <menu_item_call
-           enabled="false"
-           label="Gloves"
-           layout="topleft"
-           name="Gloves">
-            <menu_item_call.on_click
-             function="Edit.TakeOff"
-             parameter="gloves" />
-            <menu_item_call.on_enable
-             function="Edit.EnableTakeOff"
-             parameter="gloves" />
-          </menu_item_call>
-          <menu_item_call
-                enabled="false"
-                label="Undershirt"
-                layout="topleft"
-                name="Self Undershirt">
-            <menu_item_call.on_click
-             function="Edit.TakeOff"
-             parameter="undershirt" />
-            <menu_item_call.on_enable
-             function="Edit.EnableTakeOff"
-             parameter="undershirt" />
-          </menu_item_call>
-          <menu_item_call
-            enabled="false"
-            label="Underpants"
-            layout="topleft"
-            name="Self Underpants">
-            <menu_item_call.on_click
-             function="Edit.TakeOff"
-             parameter="underpants" />
-            <menu_item_call.on_enable
-             function="Edit.EnableTakeOff"
-             parameter="underpants" />
-          </menu_item_call>
-          <menu_item_call
-            enabled="false"
-            label="Tattoo"
-            layout="topleft"
-            name="Self Tattoo">
-            <menu_item_call.on_click
-             function="Edit.TakeOff"
-             parameter="tattoo" />
-            <menu_item_call.on_enable
-             function="Edit.EnableTakeOff"
-             parameter="tattoo" />
-          </menu_item_call>
-          <menu_item_call
-            enabled="false"
-            label="Physics"
-            layout="topleft"
-            name="Self Physics">
-            <menu_item_call.on_click
-             function="Edit.TakeOff"
-             parameter="physics" />
-            <menu_item_call.on_enable
-             function="Edit.EnableTakeOff"
-             parameter="physics" />
-          </menu_item_call>
-          <menu_item_call
-            enabled="false"
-            label="Alpha"
-            layout="topleft"
-            name="Self Alpha">
-            <menu_item_call.on_click
-             function="Edit.TakeOff"
-             parameter="alpha" />
-            <menu_item_call.on_enable
-             function="Edit.EnableTakeOff"
-             parameter="alpha" />
-          </menu_item_call>
-          <menu_item_separator
-           layout="topleft" />
-          <menu_item_call
-           label="All Clothes"
-           layout="topleft"
-           name="All Clothes">
-            <menu_item_call.on_click
-             function="Edit.TakeOff"
-             parameter="all" />
-          </menu_item_call>
-        </menu>
-        <menu
-         label="HUD"
-         layout="topleft"
-         name="Avatar Detach HUD" />
-        <menu
-         label="Detach"
-         layout="topleft"
-         name="Avatar Detach" />
-        <menu_item_call
-         label="Detach All"
-         layout="topleft"
-         name="Detach All">
-          <menu_item_call.on_click
-           function="Self.RemoveAllAttachments"
-           parameter="" />
-          <menu_item_call.on_enable
-           function="Self.EnableRemoveAllAttachments" />
-        </menu_item_call>
-      </menu>
       <menu_item_separator/>
 
        <menu_item_call
@@ -402,7 +220,7 @@
            function="Agent.enableFlyLand" />
         </menu_item_call>       
         <menu_item_call
-         label="Stop animations"
+         label="Stop animation"
          name="Stop Animating My Avatar">
           <menu_item_call.on_click
            function="Tools.StopAllAnimations" />
@@ -466,7 +284,7 @@
      name="Help with avatars">
         <menu_item_call.on_click
             function="Advanced.ShowURL"
-            parameter="https://community.secondlife.com/search/?type=cms_records3&amp;tags=avatar&amp;nodes=30&amp;search_and_or=or"/>
+            parameter="https://community.secondlife.com/search/?q=avatar"/>
       </menu_item_call>
     </menu>
     <menu
-- 
cgit v1.2.3


From 7d93032f08f134ba39a9008be7c0ee20db7ac59c Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Tue, 24 Nov 2020 04:20:15 +0200
Subject: Revert "SL-13479 Dedicated top-level menu for avatar editing"

This reverts commit ca6bb3506d13975bd5a817a09658fa78d7716cc6.
---
 .../skins/default/xui/en/floater_avatar.xml        |   2 +-
 .../skins/default/xui/en/floater_my_appearance.xml |   2 +-
 .../skins/default/xui/en/floater_my_scripts.xml    |   2 +-
 .../skins/default/xui/en/menu_attachment_other.xml |   5 +-
 .../skins/default/xui/en/menu_attachment_self.xml  | 115 ++++--
 .../skins/default/xui/en/menu_avatar_other.xml     |   5 +-
 .../skins/default/xui/en/menu_avatar_self.xml      | 451 +++++++++++----------
 indra/newview/skins/default/xui/en/menu_viewer.xml | 279 ++++++-------
 .../skins/default/xui/en/panel_edit_wearable.xml   |   2 +-
 .../skins/default/xui/en/panel_outfit_edit.xml     |   2 +-
 10 files changed, 454 insertions(+), 411 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_avatar.xml b/indra/newview/skins/default/xui/en/floater_avatar.xml
index 3df2683ca8..92c5d8bcbe 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar.xml
@@ -14,7 +14,7 @@
  help_topic="avatar"
  save_rect="true"
  save_visibility="true"
- title="COMPLETE AVATARS"
+ title="CHOOSE AN AVATAR"
  width="700">
     <web_browser
       top="25"
diff --git a/indra/newview/skins/default/xui/en/floater_my_appearance.xml b/indra/newview/skins/default/xui/en/floater_my_appearance.xml
index 35ad87ceb0..fdea7a821a 100644
--- a/indra/newview/skins/default/xui/en/floater_my_appearance.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_appearance.xml
@@ -11,7 +11,7 @@
   save_rect="true"
   single_instance="true"
   reuse_instance="true"
-  title="AVATAR"
+  title="APPEARANCE"
   min_height="440"
   min_width="333"
   width="333">
diff --git a/indra/newview/skins/default/xui/en/floater_my_scripts.xml b/indra/newview/skins/default/xui/en/floater_my_scripts.xml
index ee6defce9d..3b0b6723c7 100644
--- a/indra/newview/skins/default/xui/en/floater_my_scripts.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_scripts.xml
@@ -7,7 +7,7 @@
  layout="topleft"
  name="myscripts"
  save_rect="true"
- title="ATTACHMENT SCRIPTS"
+ title="My Scripts"
  min_width="620"
  width="620">
   <panel
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
index 7ad692038e..38f4b7715f 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -173,13 +173,16 @@
           parameter="avatar_render_settings" />
       </menu_item_call>
       </context_menu>
+  <menu_item_separator
+       layout="topleft" name="Impostor seperator"/>
+
   <menu_item_call
      enabled="false"
      label="Block Particle Owner"
      name="Mute Particle">
     <menu_item_call.on_click
      function="Particle.Mute" />
-    <menu_item_call.on_visible
+    <menu_item_call.on_enable
      function="EnableMuteParticle" />
   </menu_item_call>
 </context_menu>
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 03c05e6591..59faf6a9f5 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -4,7 +4,7 @@
  name="Attachment Pie">
     <menu_item_call
      enabled="false"
-     label="Touch item"
+     label="Touch"
      layout="topleft"
      name="Attachment Object Touch">
         <menu_item_call.on_click
@@ -13,9 +13,19 @@
          function="Object.EnableTouch"
          name="EnableTouch"/>
     </menu_item_call>
+    <!--menu_item_call
+     label="Stand Up"
+     layout="topleft"
+     name="Stand Up">
+        <menu_item_call.on_click
+         function="Self.StandUp"
+         parameter="" />
+        <menu_item_call.on_enable
+         function="Self.EnableStandUp" />
+    </menu_item_call-->
     <menu_item_call
      enabled="false"
-     label="Edit item"
+     label="Edit"
      layout="topleft"
      name="Edit...">
         <menu_item_call.on_click
@@ -25,7 +35,7 @@
     </menu_item_call>
     <menu_item_call
      enabled="false"
-     label="Detach item"
+     label="Detach"
      layout="topleft"
      name="Detach">
         <menu_item_call.on_click
@@ -36,15 +46,36 @@
   <menu_item_separator
     layout="topleft" />
 
+    <menu_item_call
+     label="Sit Down"
+     layout="topleft"
+     name="Sit Down Here">
+        <menu_item_call.on_click
+         function="Self.SitDown"
+         parameter="" />
+        <menu_item_call.on_enable
+         function="Self.EnableSitDown" />
+    </menu_item_call>
+
+  <menu_item_call
+label="Stand Up"
+layout="topleft"
+name="Stand Up">
+    <menu_item_call.on_click
+     function="Self.StandUp"
+     parameter="" />
+    <menu_item_call.on_enable
+     function="Self.EnableStandUp" />
+  </menu_item_call>
   <menu_item_call
-  label="Outfits..."
+  label="My Appearance"
   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="Edit current outfit..."
+  <menu_item_call label="Edit My Outfit"
 layout="topleft"
 name="Edit Outfit">
     <menu_item_call.on_click
@@ -52,7 +83,7 @@ name="Edit Outfit">
     <menu_item_call.on_enable
      function="Edit.EnableCustomizeAvatar" />
   </menu_item_call>
-  <menu_item_call label="Shape..."
+  <menu_item_call label="Edit My Shape"
     layout="topleft"
     name="Edit My Shape">
     <menu_item_call.on_click
@@ -60,7 +91,7 @@ name="Edit Outfit">
     <menu_item_call.on_enable
      function="Edit.EnableEditShape" />
   </menu_item_call>
-  <menu_item_call label="Hover height..."
+  <menu_item_call label="Hover Height"
      layout="topleft"
      name="Hover Height">
      <menu_item_call.on_click
@@ -68,43 +99,43 @@ name="Edit Outfit">
      <menu_item_call.on_enable
       function="Edit.EnableHoverHeight" />
   </menu_item_call>
-  <menu_item_separator/>
-  <menu_item_call
-    label="Sit / stand"
-    layout="topleft"
-    name="Sit stand">
-    <menu_item_call.on_click
-     function="Self.ToggleSitStand"/>
-    <menu_item_call.on_enable
-     function="Self.EnableSitStand" />
-  </menu_item_call>
-  <menu_item_call
-     label="Fly / land"
-     name="Fly land">
-    <menu_item_call.on_click
-     function="Agent.toggleFlying" />
-    <menu_item_call.on_enable
-     function="Agent.enableFlyLand" />
-  </menu_item_call>
-  <menu_item_call
-     label="Stop animations"
-     name="Stop Animating My Avatar">
-    <menu_item_call.on_click
-     function="Tools.StopAllAnimations" />
-  </menu_item_call>
-  <menu_item_separator/>
-  <menu_item_call label="Reset skeleton"
+  <menu_item_call label="Reset Skeleton"
        layout="topleft"
        name="Reset Skeleton">
        <menu_item_call.on_click
         function="Avatar.ResetSkeleton" />
   </menu_item_call>
-  <menu_item_call label="Reset skeleton and animations"
+  <menu_item_call label="Reset Skeleton And Animations"
        layout="topleft"
        name="Reset Skeleton And Animations">
        <menu_item_call.on_click
         function="Avatar.ResetSkeletonAndAnimations" />
   </menu_item_call>
+
+  <menu_item_call
+    label="My Friends"
+    layout="topleft"
+    name="Friends...">
+    <menu_item_call.on_click
+     function="SideTray.PanelPeopleTab"
+     parameter="friends_panel" />
+  </menu_item_call>
+  <menu_item_call
+   label="My Groups"
+   layout="topleft"
+   name="Groups...">
+    <menu_item_call.on_click
+     function="SideTray.PanelPeopleTab"
+     parameter="groups_panel" />
+  </menu_item_call>
+  <menu_item_call
+    label="My Profile"
+    layout="topleft"
+    name="Profile...">
+    <menu_item_call.on_click
+     function="ShowAgentProfile"
+     parameter="agent" />
+  </menu_item_call>
   <menu_item_call
  label="Debug Textures"
      name="Debug...">
@@ -121,13 +152,27 @@ name="Edit Outfit">
             <menu_item_call.on_visible
              function="Advanced.EnableAppearanceToXML"/>
     </menu_item_call>
+  <menu_item_separator
+  layout="topleft" />
+  <menu_item_call
+ enabled="false"
+ label="Drop"
+ layout="topleft"
+ name="Drop">
+    <menu_item_call.on_click
+     function="Attachment.Drop" />
+    <menu_item_call.on_enable
+     function="Attachment.EnableDrop" />
+  </menu_item_call>
+  <menu_item_separator
+       layout="topleft" />
   <menu_item_call
      enabled="false"
      label="Block Particle Owner"
      name="Mute Particle">
     <menu_item_call.on_click
      function="Particle.Mute" />
-    <menu_item_call.on_visible
+    <menu_item_call.on_enable
      function="EnableMuteParticle" />
   </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
index acbb9b860d..f9fb847910 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -165,13 +165,16 @@
       </menu_item_call>
       </context_menu>
 
+  <menu_item_separator 
+    layout="topleft"  name="Impostor seperator"/>
+
   <menu_item_call
      enabled="false"
      label="Block Particle Owner"
      name="Mute Particle">
     <menu_item_call.on_click
      function="Particle.Mute" />
-    <menu_item_call.on_visible
+    <menu_item_call.on_enable
      function="EnableMuteParticle" />
   </menu_item_call>
 </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 3dcafb13ef..9e181d0b6d 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,209 @@
  layout="topleft"
  name="Self Pie">
     <menu_item_call
-     label="Outfits..."
+     label="Sit Down"
+     layout="topleft"
+     name="Sit Down Here">
+        <menu_item_call.on_click
+         function="Self.SitDown"
+         parameter="" />
+        <menu_item_call.on_enable
+         function="Self.EnableSitDown" />
+    </menu_item_call>
+    <menu_item_call
+     label="Stand Up"
+     layout="topleft"
+     name="Stand Up">
+        <menu_item_call.on_click
+         function="Self.StandUp"
+         parameter="" />
+        <menu_item_call.on_enable
+         function="Self.EnableStandUp" />
+    </menu_item_call>
+    <context_menu
+     label="Take Off"
+     layout="topleft"
+     name="Take Off &gt;">
+        <context_menu
+         label="Clothes"
+         layout="topleft"
+         name="Clothes &gt;">
+            <menu_item_call
+             enabled="false"
+             label="Shirt"
+             layout="topleft"
+             name="Shirt">
+                <menu_item_call.on_click
+                 function="Edit.TakeOff"
+                 parameter="shirt" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableTakeOff"
+                 parameter="shirt" />
+            </menu_item_call>
+            <menu_item_call
+             enabled="false"
+             label="Pants"
+             layout="topleft"
+             name="Pants">
+                <menu_item_call.on_click
+                 function="Edit.TakeOff"
+                 parameter="pants" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableTakeOff"
+                 parameter="pants" />
+            </menu_item_call>
+            <menu_item_call
+             enabled="false"
+             label="Skirt"
+             layout="topleft"
+             name="Skirt">
+                <menu_item_call.on_click
+                 function="Edit.TakeOff"
+                 parameter="skirt" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableTakeOff"
+                 parameter="skirt" />
+            </menu_item_call>
+            <menu_item_call
+             enabled="false"
+             label="Shoes"
+             layout="topleft"
+             name="Shoes">
+                <menu_item_call.on_click
+                 function="Edit.TakeOff"
+                 parameter="shoes" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableTakeOff"
+                 parameter="shoes" />
+            </menu_item_call>
+            <menu_item_call
+             enabled="false"
+             label="Socks"
+             layout="topleft"
+             name="Socks">
+                <menu_item_call.on_click
+                 function="Edit.TakeOff"
+                 parameter="socks" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableTakeOff"
+                 parameter="socks" />
+            </menu_item_call>
+            <menu_item_call
+             enabled="false"
+             label="Jacket"
+             layout="topleft"
+             name="Jacket">
+                <menu_item_call.on_click
+                 function="Edit.TakeOff"
+                 parameter="jacket" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableTakeOff"
+                 parameter="jacket" />
+            </menu_item_call>
+            <menu_item_call
+             enabled="false"
+             label="Gloves"
+             layout="topleft"
+             name="Gloves">
+                <menu_item_call.on_click
+                 function="Edit.TakeOff"
+                 parameter="gloves" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableTakeOff"
+                 parameter="gloves" />
+            </menu_item_call>
+           <menu_item_call
+                 enabled="false"
+                 label="Undershirt"
+                 layout="topleft"
+                 name="Self Undershirt">
+                    <menu_item_call.on_click
+                     function="Edit.TakeOff"
+                     parameter="undershirt" />
+                    <menu_item_call.on_enable
+                     function="Edit.EnableTakeOff"
+                     parameter="undershirt" />
+                </menu_item_call>
+               <menu_item_call
+                 enabled="false"
+                 label="Underpants"
+                 layout="topleft"
+                 name="Self Underpants">
+                    <menu_item_call.on_click
+                     function="Edit.TakeOff"
+                     parameter="underpants" />
+                    <menu_item_call.on_enable
+                     function="Edit.EnableTakeOff"
+                     parameter="underpants" />
+                </menu_item_call>
+               <menu_item_call
+                 enabled="false"
+                 label="Tattoo"
+                 layout="topleft"
+                 name="Self Tattoo">
+                    <menu_item_call.on_click
+                     function="Edit.TakeOff"
+                     parameter="tattoo" />
+                    <menu_item_call.on_enable
+                     function="Edit.EnableTakeOff"
+                     parameter="tattoo" />
+                </menu_item_call>
+               <menu_item_call
+                 enabled="false"
+                 label="Physics"
+                 layout="topleft"
+                 name="Self Physics">
+                    <menu_item_call.on_click
+                     function="Edit.TakeOff"
+                     parameter="physics" />
+                    <menu_item_call.on_enable
+                     function="Edit.EnableTakeOff"
+                     parameter="physics" />
+                </menu_item_call>
+               <menu_item_call
+                 enabled="false"
+                 label="Alpha"
+                 layout="topleft"
+                 name="Self Alpha">
+                    <menu_item_call.on_click
+                     function="Edit.TakeOff"
+                     parameter="alpha" />
+                    <menu_item_call.on_enable
+                     function="Edit.EnableTakeOff"
+                     parameter="alpha" />
+                </menu_item_call>
+                <menu_item_separator
+                 layout="topleft" />
+                <menu_item_call
+                 label="All Clothes"
+                 layout="topleft"
+                 name="All Clothes">
+                    <menu_item_call.on_click
+                     function="Edit.TakeOff"
+                     parameter="all" />
+                </menu_item_call>
+        </context_menu>
+        <context_menu
+         label="HUD"
+         layout="topleft"
+         name="Object Detach HUD" />
+        <context_menu
+         label="Detach"
+         layout="topleft"
+         name="Object Detach" />
+        <menu_item_call
+         label="Detach All"
+         layout="topleft"
+         name="Detach All">
+            <menu_item_call.on_click
+             function="Self.RemoveAllAttachments"
+             parameter="" />
+            <menu_item_call.on_enable
+             function="Self.EnableRemoveAllAttachments" />
+        </menu_item_call>
+    </context_menu>
+     <menu_item_call
+     label="My Appearance"
      layout="topleft"
      name="Chenge Outfit">
         <menu_item_call.on_click
@@ -11,7 +213,7 @@
         <menu_item_call.on_enable
          function="Edit.EnableCustomizeAvatar" />
     </menu_item_call>
-    <menu_item_call label="Edit current outfit..." 
+    <menu_item_call label="Edit My Outfit" 
     layout="topleft"
     name="Edit Outfit">
        <menu_item_call.on_click
@@ -19,7 +221,7 @@
        <menu_item_call.on_enable
         function="Edit.EnableCustomizeAvatar" />
    </menu_item_call>
-    <menu_item_call label="Shape..." 
+    <menu_item_call label="Edit My Shape" 
     layout="topleft"
     name="Edit My Shape">
        <menu_item_call.on_click
@@ -27,7 +229,7 @@
        <menu_item_call.on_enable
         function="Edit.EnableEditShape" />
    </menu_item_call>
-   <menu_item_call label="Hover height..."
+   <menu_item_call label="Hover Height"
      layout="topleft"
      name="Hover Height">
      <menu_item_call.on_click
@@ -35,225 +237,42 @@
      <menu_item_call.on_enable
       function="Edit.EnableHoverHeight" />
    </menu_item_call>
-  <context_menu
-    label="Take Off"
-    layout="topleft"
-    name="Take Off &gt;">
-    <context_menu
-     label="Clothes"
-     layout="topleft"
-     name="Clothes &gt;">
-      <menu_item_call
-       enabled="false"
-       label="Shirt"
-       layout="topleft"
-       name="Shirt">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="shirt" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="shirt" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Pants"
-       layout="topleft"
-       name="Pants">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="pants" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="pants" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Skirt"
-       layout="topleft"
-       name="Skirt">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="skirt" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="skirt" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Shoes"
-       layout="topleft"
-       name="Shoes">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="shoes" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="shoes" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Socks"
-       layout="topleft"
-       name="Socks">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="socks" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="socks" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Jacket"
-       layout="topleft"
-       name="Jacket">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="jacket" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="jacket" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Gloves"
-       layout="topleft"
-       name="Gloves">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="gloves" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="gloves" />
-      </menu_item_call>
-      <menu_item_call
-            enabled="false"
-            label="Undershirt"
-            layout="topleft"
-            name="Self Undershirt">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="undershirt" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="undershirt" />
-      </menu_item_call>
-      <menu_item_call
-        enabled="false"
-        label="Underpants"
-        layout="topleft"
-        name="Self Underpants">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="underpants" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="underpants" />
-      </menu_item_call>
-      <menu_item_call
-        enabled="false"
-        label="Tattoo"
-        layout="topleft"
-        name="Self Tattoo">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="tattoo" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="tattoo" />
-      </menu_item_call>
-      <menu_item_call
-        enabled="false"
-        label="Physics"
-        layout="topleft"
-        name="Self Physics">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="physics" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="physics" />
-      </menu_item_call>
-      <menu_item_call
-        enabled="false"
-        label="Alpha"
-        layout="topleft"
-        name="Self Alpha">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="alpha" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="alpha" />
-      </menu_item_call>
-      <menu_item_separator
-       layout="topleft" />
-      <menu_item_call
-       label="All Clothes"
-       layout="topleft"
-       name="All Clothes">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="all" />
-      </menu_item_call>
-    </context_menu>
-    <context_menu
-     label="HUD"
-     layout="topleft"
-     name="Object Detach HUD" />
-    <context_menu
-     label="Detach"
-     layout="topleft"
-     name="Object Detach" />
-    <menu_item_call
-     label="Detach All"
-     layout="topleft"
-     name="Detach All">
-      <menu_item_call.on_click
-       function="Self.RemoveAllAttachments"
-       parameter="" />
-      <menu_item_call.on_enable
-       function="Self.EnableRemoveAllAttachments" />
-    </menu_item_call>
-  </context_menu>
-  <menu_item_separator/>
-  <menu_item_call
-    label="Sit / stand"
-    layout="topleft"
-    name="Sit stand">
-      <menu_item_call.on_click
-       function="Self.ToggleSitStand"/>
-      <menu_item_call.on_enable
-       function="Self.EnableSitStand" />
-  </menu_item_call>
-  <menu_item_call
-     label="Fly / land"
-     name="Fly land">
-      <menu_item_call.on_click
-       function="Agent.toggleFlying" />
-      <menu_item_call.on_enable
-       function="Agent.enableFlyLand" />
-  </menu_item_call>
-  <menu_item_call
-     label="Stop animations"
-     name="Stop Animating My Avatar">
-        <menu_item_call.on_click
-         function="Tools.StopAllAnimations" />
-  </menu_item_call>
-  <menu_item_separator/>
-  <menu_item_call label="Reset skeleton"
+   <menu_item_call label="Reset Skeleton"
      layout="topleft"
      name="Reset Skeleton">
      <menu_item_call.on_click
       function="Avatar.ResetSkeleton" />
-  </menu_item_call>
-  <menu_item_call label="Reset skeleton and animations"
+   </menu_item_call>
+  <menu_item_call label="Reset Skeleton And Animations"
        layout="topleft"
        name="Reset Skeleton And Animations">
        <menu_item_call.on_click
         function="Avatar.ResetSkeletonAndAnimations" />
   </menu_item_call>
+   <menu_item_call
+     label="My Friends"
+     layout="topleft"
+     name="Friends...">
+        <menu_item_call.on_click
+         function="SideTray.PanelPeopleTab"
+         parameter="friends_panel" />
+    </menu_item_call>
+    <menu_item_call
+     label="My Groups"
+     layout="topleft"
+     name="Groups...">
+        <menu_item_call.on_click
+         function="SideTray.PanelPeopleTab"
+         parameter="groups_panel" />
+    </menu_item_call>
+   <menu_item_call
+     label="My Profile"
+     layout="topleft"
+     name="Profile...">
+        <menu_item_call.on_click
+         function="ShowAgentProfile"
+         parameter="agent" />
+    </menu_item_call>
     <menu_item_call
 		 label="Debug Textures"
          name="Debug...">
@@ -270,6 +289,8 @@
             <menu_item_call.on_visible
              function="Advanced.EnableAppearanceToXML"/>
     </menu_item_call>
+  <menu_item_separator
+       layout="topleft" />
   <menu_item_call
      enabled="false"
      label="Block Particle Owner"
@@ -277,7 +298,7 @@
     <menu_item_call.on_click
      function="Particle.Mute" />
 
-    <menu_item_call.on_visible
+    <menu_item_call.on_enable
      function="EnableMuteParticle" />
   </menu_item_call>
 </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 eb9471e300..5fa1847d1b 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -15,6 +15,24 @@
          function="ShowAgentProfile"
          parameter="agent" />
       </menu_item_call>
+      <menu_item_call
+       label="Appearance..."
+       name="ChangeOutfit"
+       shortcut="control|O">
+        <menu_item_call.on_click
+         function="Floater.ToggleOrBringToFront"
+         parameter="appearance" />
+        <menu_item_call.on_enable
+         function="Edit.EnableCustomizeAvatar" />
+      </menu_item_call>
+      <menu_item_call
+       label="Choose an avatar..."
+       name="Avatar Picker">
+        <menu_item_call.on_click
+         function="Floater.ToggleOrBringToFront"
+         parameter="avatar" />
+      </menu_item_call>
+      <menu_item_separator/>
       <menu_item_check
          label="Inventory..."
          name="Inventory"
@@ -57,6 +75,14 @@
           function="Floater.ToggleOrBringToFront"
           parameter="experiences"/>
       </menu_item_call>
+      <menu_item_call
+        label="My Scripts..."
+        name="MyScripts">
+        <menu_item_call.on_click
+          function="Floater.ToggleOrBringToFront"
+          parameter="my_scripts"/>
+      </menu_item_call>
+      <menu_item_separator/>
       <menu_item_call
        label="Camera Controls..."
        name="Camera Controls">
@@ -64,23 +90,105 @@
          function="Floater.ToggleOrBringToFront"
          parameter="camera" />
       </menu_item_call>
-      <menu_item_separator/>
-      <menu_item_check
-       name="Away"
-       label="Away">
-        <menu_item_check.on_check
-         function="View.Status.CheckAway" />
-        <menu_item_check.on_click
-         function="World.SetAway" />
-      </menu_item_check>
-      <menu_item_check
-       name="Do Not Disturb"
-       label="Do Not Disturb">
-        <menu_item_check.on_check
-         function="View.Status.CheckDoNotDisturb" />
-        <menu_item_check.on_click
-         function="World.SetDoNotDisturb"/>
-      </menu_item_check>
+      <menu
+       create_jump_keys="true"
+       label="Movement"
+       name="Movement"
+       tear_off="true">
+        <menu_item_call
+         label="Sit Down"
+         layout="topleft"
+         shortcut="alt|shift|S"
+         name="Sit Down Here">
+          <menu_item_call.on_click
+           function="Self.SitDown"/>
+          <menu_item_call.on_visible
+           function="Self.ShowSitDown"/>
+          <menu_item_call.on_enable
+           function="Self.EnableSitDown" />
+        </menu_item_call>
+        <menu_item_call
+         label="Stand Up"
+         layout="topleft"
+         shortcut="alt|shift|S"
+         name="Stand up">
+          <menu_item_call.on_click
+           function="Self.StandUp"/>
+          <menu_item_call.on_visible
+           function="Self.EnableStandUp"/>
+          <menu_item_call.on_enable
+           function="Self.EnableStandUp" />
+        </menu_item_call>
+        <menu_item_check
+         label="Fly"
+         name="Fly"
+         shortcut="HOME">
+          <menu_item_check.on_check
+           function="Agent.getFlying" />
+          <menu_item_check.on_click
+           function="Agent.toggleFlying" />
+          <menu_item_check.on_enable
+           function="Agent.enableFlying" />
+        </menu_item_check>
+        <menu_item_call
+         label="Stop flying"
+         name="Stop flying"
+         shortcut="HOME">
+          <menu_item_call.on_click
+           function="Agent.toggleFlying" />
+          <menu_item_call.on_enable
+           function="Agent.getFlying" />
+        </menu_item_call>	
+        <menu_item_check
+         label="Always Run"
+         name="Always Run"
+         shortcut="control|R">
+          <menu_item_check.on_check
+           function="World.CheckAlwaysRun" />
+          <menu_item_check.on_click
+           function="World.AlwaysRun" />
+        </menu_item_check>
+        <menu_item_call
+         label="Stop Animating Me"
+         name="Stop Animating My Avatar">
+          <menu_item_call.on_click
+           function="Tools.StopAllAnimations" />
+        </menu_item_call>
+        <menu_item_check
+         label="Walk / run / fly..."
+         name="WalkRunFly">
+          <menu_item_check.on_check
+           function="Floater.Visible"
+           parameter="moveview" />
+          <menu_item_check.on_click
+           function="Floater.ToggleOrBringToFront"
+           parameter="moveview" />
+        </menu_item_check>
+      </menu>
+
+      <menu
+       create_jump_keys="true"
+       label="Status"
+       name="Status"
+       tear_off="true">
+        <menu_item_check
+         name="Away"
+         label="Away">
+          <menu_item_check.on_check
+           function="View.Status.CheckAway" />
+          <menu_item_check.on_click
+           function="World.SetAway" />
+        </menu_item_check>
+        <menu_item_check
+         name="Do Not Disturb"
+         label="Do Not Disturb">
+          <menu_item_check.on_check
+           function="View.Status.CheckDoNotDisturb" />
+          <menu_item_check.on_click
+           function="World.SetDoNotDisturb"/>
+        </menu_item_check>
+      
+    </menu>
 
       <menu_item_separator/>
 
@@ -150,143 +258,6 @@
              function="File.Quit" />
         </menu_item_call>
     </menu>
-    <menu
-     create_jump_keys="true"
-     label="Avatar"
-     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"
-         shortcut="control|O">
-            <menu_item_call.on_click
-             function="Floater.ToggleOrBringToFront"
-             parameter="appearance" />
-            <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">
-            <menu_item_call.on_click
-             function="HoverHeight" />
-            <menu_item_call.on_enable
-             function="Edit.EnableHoverHeight" />
-      </menu_item_call>
-      <menu_item_separator/>
-
-       <menu_item_call
-         label="Sit / stand"
-         layout="topleft"
-         shortcut="alt|shift|S"
-         name="Sit stand">
-          <menu_item_call.on_click
-           function="Self.ToggleSitStand"/>
-          <menu_item_call.on_enable
-           function="Self.EnableSitStand" />
-        </menu_item_call>
-        <menu_item_call
-         label="Fly / land"
-         name="Fly land"
-         shortcut="HOME">
-          <menu_item_call.on_click
-           function="Agent.toggleFlying" />
-          <menu_item_call.on_enable
-           function="Agent.enableFlyLand" />
-        </menu_item_call>       
-        <menu_item_call
-         label="Stop animation"
-         name="Stop Animating My Avatar">
-          <menu_item_call.on_click
-           function="Tools.StopAllAnimations" />
-        </menu_item_call>
-        <menu_item_check
-          label="Walk / run / fly..."
-          name="WalkRunFly">
-          <menu_item_check.on_check
-           function="Floater.Visible"
-           parameter="moveview" />
-          <menu_item_check.on_click
-           function="Floater.ToggleOrBringToFront"
-           parameter="moveview" />
-        </menu_item_check>
-        <menu_item_check
-          label="Always run"
-          name="Always Run"
-          shortcut="control|R">
-          <menu_item_check.on_check
-           function="World.CheckAlwaysRun" />
-          <menu_item_check.on_click
-           function="World.AlwaysRun" />
-        </menu_item_check>
-      <menu_item_separator/>
-      <menu_item_check
-       label="Gestures..."
-       name="Gestures"
-       shortcut="control|G">
-        <menu_item_check.on_check
-         function="Floater.Visible"
-         parameter="gestures" />
-        <menu_item_check.on_click
-         function="Floater.Toggle"
-         parameter="gestures" />
-      </menu_item_check>
-      <menu_item_separator/>
-      <menu_item_call 
-       label="Reset skeleton"
-       layout="topleft"
-       name="Reset Skeleton">
-        <menu_item_call.on_click
-         function="Avatar.ResetSkeleton" />
-      </menu_item_call>
-      <menu_item_call 
-       label="Reset skeleton and animations"
-       layout="topleft"
-       name="Reset Skeleton And Animations">
-        <menu_item_call.on_click
-         function="Avatar.ResetSkeletonAndAnimations" />
-      </menu_item_call>
-      <menu_item_call
-       label="Attachment scripts..."
-       name="MyScripts">
-        <menu_item_call.on_click
-         function="Floater.ToggleOrBringToFront"
-         parameter="my_scripts"/>
-      </menu_item_call>
-      <menu_item_separator/>
-      <menu_item_call
-     label="Help with avatars..."
-     name="Help with avatars">
-        <menu_item_call.on_click
-            function="Advanced.ShowURL"
-            parameter="https://community.secondlife.com/search/?q=avatar"/>
-      </menu_item_call>
-    </menu>
     <menu
      create_jump_keys="true"
      label="Communicate"
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 85d73ece48..dc1553e6a3 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -13,7 +13,7 @@
  width="333">
     <string
      name="edit_shape_title">
-        Shape
+        Editing Shape
     </string>
     <string
      name="edit_skin_title">
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 6fd54d7c6a..3f7444dec3 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"
             use_ellipses="true"
             width="275" />
 
-- 
cgit v1.2.3


From 300f6f8b8e74fb5538beeb39b88ee9bccf9e8129 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 26 Nov 2020 14:45:30 +0200
Subject: Revert "SL-13463 Add 'Reset scripts' button to Content tab of Build
 floater"

---
 indra/newview/skins/default/xui/en/floater_tools.xml | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 1377bad6cf..0abee2ff80 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2575,22 +2575,13 @@ even though the user gets a free copy.
              border_visible="true"
              bevel_style="in"
              follows="left|top|right"
-             height="300"
+             height="325"
              layout="topleft"
              left="10"
              name="contents_inventory"
              top="50"
              width="275" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Reset Scripts"
-             layout="topleft"
-             left="10"
-             name="btn_reset_scripts"
-             bottom="-1"
-             width="118" />
-       </panel>
+		</panel>
         </tab_container>
 	<panel
 	 follows="left|top"
-- 
cgit v1.2.3


From fa710f3a9e11dc857a0eea8d3fe01f50a9b8a02d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 17 Nov 2020 21:16:04 +0200
Subject: SL-14283 When updater is missing, viewer fails to launch silently

---
 indra/newview/skins/default/xui/en/notifications.xml | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 29d570de64..2f4da4f9b7 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9595,6 +9595,10 @@ If you continue to have problems, please visit the [SUPPORT_SITE].
   <global name="UnsupportedRAM">
 - Your system memory does not meet the minimum requirements.
   </global>
+  
+  <global name="LLLeapUpdaterFailure">
+Failed to launch updater service [UPDATER_APP]. Please verify the viewer is installed correctly and has the necessary permissions to run. If you continue to experience issues, please visit the [SUPPORT_SITE].
+  </global>
 
 <!-- these are alert strings from server. the name needs to match entire the server string, and needs to be changed
 	whenever the server string changes -->
-- 
cgit v1.2.3