From a1695760821b4d19af204918a1764d9fca3e99b9 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 24 Oct 2023 19:31:20 +0300
Subject: SL-20468 Add ability to overwrite an existing outfit

---
 .../default/xui/en/menu_gallery_inventory.xml      |   6 +-
 .../default/xui/en/menu_gallery_outfit_tab.xml     |  94 ++++++++------
 .../skins/default/xui/en/menu_inventory.xml        |   6 +-
 .../skins/default/xui/en/menu_outfit_gear.xml      | 138 ++++++++++++---------
 .../skins/default/xui/en/menu_outfit_tab.xml       |  37 ++++--
 .../newview/skins/default/xui/en/notifications.xml |  16 +++
 6 files changed, 181 insertions(+), 116 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
index d82c453e5f..8cf0479b27 100644
--- a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
@@ -35,7 +35,7 @@
      layout="topleft"
      name="Folder Wearables Separator" />
     <menu_item_call
-     label="Replace Current Outfit"
+     label="Replace current outfit"
      layout="topleft"
      name="Replace Outfit">
         <menu_item_call.on_click
@@ -43,7 +43,7 @@
          parameter="replaceoutfit" />
     </menu_item_call>
     <menu_item_call
-     label="Add To Current Outfit"
+     label="Add folder items"
      layout="topleft"
      name="Add To Outfit">
         <menu_item_call.on_click
@@ -51,7 +51,7 @@
          parameter="addtooutfit" />
     </menu_item_call>
     <menu_item_call
-     label="Remove From Current Outfit"
+     label="Take off folder items"
      layout="topleft"
      name="Remove From Outfit">
         <menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
index 0ca505dd5d..c93a92b2b7 100755
--- a/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
@@ -3,7 +3,7 @@
     layout="topleft"
     name="Outfit">
     <menu_item_call
-        label="Wear - Replace Current Outfit"
+        label="Replace current outfit"
         layout="topleft"
         name="wear_replace">
         <on_click
@@ -16,7 +16,7 @@
         parameter="wear_replace" />
     </menu_item_call>
     <menu_item_call
-        label="Wear - Add to Current Outfit"
+        label="Add outfit items"
         layout="topleft"
         name="wear_add">
         <on_click
@@ -29,7 +29,7 @@
         parameter="wear_add" />
     </menu_item_call>
     <menu_item_call
-        label="Take Off - Remove from Current Outfit"
+        label="Take off outfit items"
         layout="topleft"
         name="take_off">
         <on_click
@@ -41,17 +41,60 @@
         function="Outfit.OnVisible"
         parameter="take_off" />
     </menu_item_call>
+    <menu_item_separator/>
     <menu_item_call
-     label="Image..."
-     layout="topleft"
-     name="thumbnail">
+        label="Image..."
+        layout="topleft"
+        name="thumbnail">
+        <on_click
+        function="Outfit.Thumbnail" />
+    </menu_item_call>
+    <menu_item_call
+        label="Edit outfit"
+        layout="topleft"
+        name="edit">
+        <on_click
+        function="Outfit.Edit" />
+        <on_visible
+        function="Outfit.OnVisible"
+        parameter="edit" />
+    </menu_item_call>
+    <menu_item_call
+        label="Rename outfit"
+        layout="topleft"
+        name="rename">
+        <on_click
+        function="Outfit.Rename" />
+        <on_enable
+        function="Outfit.OnEnable"
+        parameter="rename" />
+    </menu_item_call>
+    <menu_item_call
+        label="Save to this outfit"
+        layout="topleft"
+        name="save">
+        <on_click
+         function="Outfit.Save" />
+    </menu_item_call>
+    <menu_item_separator>
+        <on_visible
+        function="Outfit.OnVisible"
+        parameter="delete" />
+    </menu_item_separator>
+    <menu_item_call
+        label="Delete outfit"
+        layout="topleft"
+        name="delete">
         <on_click
-         function="Outfit.Thumbnail" />
+        function="Outfit.Delete" />
+        <on_visible
+        function="Outfit.OnVisible"
+        parameter="delete" />
     </menu_item_call>
-    <menu_item_separator name="sepatator1" />
+    <menu_item_separator/>
     <menu
         height="175"
-        label="New Clothes"
+        label="New clothes"
         layout="topleft"
         left_delta="0"
         mouse_opaque="false"
@@ -157,7 +200,7 @@
     </menu>
     <menu
         height="85"
-        label="New Body Parts"
+        label="New body parts"
         layout="topleft"
         left_delta="0"
         mouse_opaque="false"
@@ -197,35 +240,4 @@
             parameter="eyes" />
         </menu_item_call>
     </menu>
-    <menu_item_separator name="sepatator2" />
-    <menu_item_call
-        label="Edit Outfit"
-        layout="topleft"
-        name="edit">
-        <on_click
-        function="Outfit.Edit" />
-        <on_visible
-        function="Outfit.OnVisible"
-        parameter="edit" />
-    </menu_item_call>
-    <menu_item_call
-        label="Rename Outfit"
-        layout="topleft"
-        name="rename">
-        <on_click
-        function="Outfit.Rename" />
-        <on_enable
-        function="Outfit.OnEnable"
-        parameter="rename" />
-    </menu_item_call>
-    <menu_item_call
-        label="Delete Outfit"
-        layout="topleft"
-        name="delete">
-        <on_click
-        function="Outfit.Delete" />
-        <on_visible
-        function="Outfit.OnVisible"
-        parameter="delete" />
-    </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index e650c10603..b8adafbaaf 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -272,7 +272,7 @@
      layout="topleft"
      name="Folder Wearables Separator" />
     <menu_item_call
-     label="Replace Current Outfit"
+     label="Replace current outfit"
      layout="topleft"
      name="Replace Outfit">
         <menu_item_call.on_click
@@ -280,7 +280,7 @@
          parameter="replaceoutfit" />
     </menu_item_call>
     <menu_item_call
-     label="Add To Current Outfit"
+     label="Add folder items"
      layout="topleft"
      name="Add To Outfit">
         <menu_item_call.on_click
@@ -288,7 +288,7 @@
          parameter="addtooutfit" />
     </menu_item_call>
     <menu_item_call
-     label="Remove From Current Outfit"
+     label="Take off folder items"
      layout="topleft"
      name="Remove From Outfit">
         <menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index e216962d12..e7a453766b 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -4,7 +4,7 @@
  visible="false"
  name="Gear Outfit">
     <menu_item_call
-     label="Wear - Replace Current Outfit"
+     label="Replace current outfit"
      layout="topleft"
      name="wear">
         <on_click
@@ -17,7 +17,7 @@
          parameter="wear" />
     </menu_item_call>
     <menu_item_call
-     label="Wear - Add to Current Outfit"
+     label="Add outfit items"
      layout="topleft"
      name="wear_add">
         <on_click
@@ -25,9 +25,11 @@
         <on_enable
          function="Gear.OnEnable"
          parameter="wear_add" />
+        <on_visible
+         function="Gear.OnVisible"/>
     </menu_item_call>
     <menu_item_call
-     label="Take Off - Remove from Current Outfit"
+     label="Take off outfit items"
      layout="topleft"
      name="take_off">
         <on_click
@@ -39,19 +41,88 @@
          function="Gear.OnVisible"
          parameter="take_off" />
     </menu_item_call>
+    <menu_item_separator name="wear_separator" />
     <menu_item_call
      label="Image..."
      layout="topleft"
      name="thumbnail">
+       <on_click
+        function="Gear.Thumbnail" />
+    </menu_item_call>
+    <menu_item_call
+     label="Rename outfit"
+     layout="topleft"
+     name="rename">
+        <on_click
+         function="Gear.Rename" />
+        <on_enable
+         function="Gear.OnEnable"
+         parameter="rename" />
+        <on_visible
+         function="Gear.OnVisible"
+         parameter="rename" />
+    </menu_item_call>
+    <menu_item_call
+     label="Save to this outfit"
+     layout="topleft"
+     name="save">
+        <on_click
+         function="Gear.Save" />
+        <on_visible
+         function="Gear.OnVisible"/>
+    </menu_item_call>
+    <menu_item_separator>
+        <on_visible
+        function="Gear.OnVisible"
+        parameter="delete" />
+    </menu_item_separator>
+    <menu_item_call
+     label="Delete outfit"
+     layout="topleft"
+     name="delete_outfit">
+        <on_click
+         function="Gear.Delete" />
+        <on_enable
+         function="Gear.OnEnable"
+         parameter="delete" />
+        <on_visible
+         function="Gear.OnVisible"
+         parameter="delete" />
+    </menu_item_call>
+    <menu_item_separator>
+        <on_visible
+         function="Gear.OnVisible"/>
+    </menu_item_separator>
+    <menu_item_check
+     label="Sort folders always by name"
+     layout="topleft"
+     name="sort_folders_by_name">
+        <on_click
+         function="Gear.SortByName" />
+        <on_check
+         function="CheckControl"
+         parameter="OutfitGallerySortByName" />
+    </menu_item_check>
+        <menu_item_call
+     label="Expand all folders"
+     layout="topleft"
+     name="expand">
+        <on_click
+         function="Gear.Expand" />
+    </menu_item_call>
+    <menu_item_call
+     label="Collapse all folders"
+     layout="topleft"
+     name="collapse">
         <on_click
-         function="Gear.Thumbnail" />
+         function="Gear.Collapse" />
     </menu_item_call>
-  <menu_item_separator name="sepatator1" />
+  <menu_item_separator/>
             <!-- copied (with minor modifications) from menu_inventory_add.xml -->
             <!--  *TODO: generate dynamically? -->
             <menu
              height="175"
-             label="New Clothes"
+             label="New clothes"
              layout="topleft"
              left_delta="0"
              mouse_opaque="false"
@@ -165,7 +236,7 @@
             </menu>
             <menu
              height="85"
-             label="New Body Parts"
+             label="New body parts"
              layout="topleft"
              left_delta="0"
              mouse_opaque="false"
@@ -206,57 +277,4 @@
                 </menu_item_call>
             </menu>
             <!-- copied from menu_inventory_add.xml -->
-
-    <menu_item_separator name="sepatator2" />
-    <menu_item_call
-     label="Expand all folders"
-     layout="topleft"
-     name="expand">
-        <on_click
-         function="Gear.Expand" />
-    </menu_item_call>
-    <menu_item_call
-     label="Collapse all folders"
-     layout="topleft"
-     name="collapse">
-        <on_click
-         function="Gear.Collapse" />
-    </menu_item_call>
-    <menu_item_call
-     label="Rename Outfit"
-     layout="topleft"
-     name="rename">
-        <on_click
-         function="Gear.Rename" />
-        <on_enable
-         function="Gear.OnEnable"
-         parameter="rename" />
-        <on_visible
-         function="Gear.OnVisible"
-         parameter="rename" />
-    </menu_item_call>
-    <menu_item_call
-     label="Delete Outfit"
-     layout="topleft"
-     name="delete_outfit">
-        <on_click
-         function="Gear.Delete" />
-        <on_enable
-         function="Gear.OnEnable"
-         parameter="delete" />
-        <on_visible
-         function="Gear.OnVisible"
-         parameter="delete" />
-    </menu_item_call>
-    <menu_item_separator name="sepatator3" />
-    <menu_item_check
-     label="Sort Folders Always by Name"
-     layout="topleft"
-     name="sort_folders_by_name">
-        <on_click
-         function="Gear.SortByName" />
-        <on_check
-         function="CheckControl"
-         parameter="OutfitGallerySortByName" />
-    </menu_item_check>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
index 8c8bb29baf..522e41df42 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
@@ -3,7 +3,7 @@
  layout="topleft"
  name="Outfit">
     <menu_item_call
-     label="Wear - Replace Current Outfit"
+     label="Replace current outfit"
      layout="topleft"
      name="wear_replace">
         <on_click
@@ -16,7 +16,7 @@
          parameter="wear_replace" />
     </menu_item_call>
     <menu_item_call
-     label="Wear - Add to Current Outfit"
+     label="Add outfit items"
      layout="topleft"
      name="wear_add">
         <on_click
@@ -29,7 +29,7 @@
          parameter="wear_add" />
     </menu_item_call>
     <menu_item_call
-     label="Take Off - Remove from Current Outfit"
+     label="Take off outfit items"
      layout="topleft"
      name="take_off">
         <on_click
@@ -41,19 +41,26 @@
          function="Outfit.OnVisible"
          parameter="take_off" />
     </menu_item_call>
+    <menu_item_separator />
     <menu_item_call
-     label="Edit Outfit"
-     layout="topleft"
-     name="edit">
+        label="Image..."
+        layout="topleft"
+        name="thumbnail">
+        <on_click
+        function="Outfit.Thumbnail" />
+    </menu_item_call>
+    <menu_item_call
+        label="Edit outfit"
+        layout="topleft"
+        name="edit">
         <on_click
          function="Outfit.Edit" />
         <on_visible
          function="Outfit.OnVisible"
          parameter="edit" />
     </menu_item_call>
-    <menu_item_separator />
     <menu_item_call
-     label="Rename Outfit"
+     label="Rename outfit"
      layout="topleft"
      name="rename">
         <on_click
@@ -63,7 +70,19 @@
          parameter="rename" />
     </menu_item_call>
     <menu_item_call
-     label="Delete Outfit"
+     label="Save to this outfit"
+     layout="topleft"
+     name="save">
+        <on_click
+         function="Outfit.Save" />
+    </menu_item_call>
+    <menu_item_separator>
+        <on_visible
+        function="Outfit.OnVisible"
+        parameter="delete" />
+    </menu_item_separator>
+    <menu_item_call
+     label="Delete outfit"
      layout="topleft"
      name="delete">
         <on_click
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 204fead7e0..d0c73f0973 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -12098,5 +12098,21 @@ Would you like to save them first?
        notext="No"
        yestext="Yes"/>
   </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmOverwriteOutfit"
+   type="alertmodal">
+      <unique/>
+This will replace the items in the
+selected outfit with the items you
+are wearing now.
+      <tag>confirm</tag>
+      <usetemplate
+       ignoretext="Confirm before overwriting outfit"
+       name="okcancelignore"
+       notext="Cancel"
+       yestext="Save"/>
+  </notification>
     
 </notifications>
-- 
cgit v1.2.3