From d812eee8ffa84ebb9b485c8102661f3a4225c9db Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Sun, 10 Nov 2024 19:59:08 +0100
Subject: [PATCH] Pull out "take" and "take copy" to the root level of context
 menu, as these are one of the often used commands; Rename "take object" to
 "take multiple"

---
 .../skins/default/xui/de/menu_object.xml      |  6 ++---
 .../skins/default/xui/en/menu_object.xml      | 26 +++++++++----------
 .../skins/default/xui/fr/menu_object.xml      |  6 ++---
 .../skins/default/xui/it/menu_object.xml      |  6 ++---
 .../skins/default/xui/pl/menu_object.xml      |  6 ++---
 .../skins/default/xui/ru/menu_object.xml      |  6 ++---
 6 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/indra/newview/skins/default/xui/de/menu_object.xml b/indra/newview/skins/default/xui/de/menu_object.xml
index 89b728e5f1..3f8d5ee08a 100644
--- a/indra/newview/skins/default/xui/de/menu_object.xml
+++ b/indra/newview/skins/default/xui/de/menu_object.xml
@@ -41,9 +41,9 @@
 	<menu_item_call label="Nicht anzeigen" name="Derender"/>
 	<menu_item_call label="Nicht anzeigen + Blacklist" name="DerenderPermanent"/>
 	<menu_item_call label="Zurückgeben" name="Return..."/>
-	<context_menu label="Objekt nehmen" name="Take Submenu">
-		<menu_item_call label="Nehmen" name="Pie Object Take"/>
-		<menu_item_call label="Kopie nehmen" name="Take Copy"/>
+	<menu_item_call label="Nehmen" name="Pie Object Take"/>
+	<menu_item_call label="Kopie nehmen" name="Take Copy"/>
+	<context_menu label="Mehrere nehmen" name="Take Multiple">
 		<menu_item_call label="Als kombiniertes Objekt nehmen" name="Take combined"/>
 		<menu_item_call label="Kopie als kombiniertes Objekt nehmen" name="Take Copy combined"/>
 		<menu_item_call label="Als separate Objekte nehmen" name="Take Separate"/>
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 2124fc2deb..202039183a 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -290,31 +290,31 @@
       <menu_item_call.on_enable
           function="Object.EnableReturn" />
     </menu_item_call>
-  <context_menu
-    label="Take object"
-    name="Take Submenu">
-    <menu_item_call
+  <menu_item_call
       label="Take"
       layout="topleft"
       name="Pie Object Take">
-      <menu_item_call.on_click
+    <menu_item_call.on_click
         function="Object.Take"/>
-      <menu_item_call.on_enable
+    <menu_item_call.on_enable
         function="Object.VisibleTake"/>
-      <menu_item_call.on_visible
+    <menu_item_call.on_visible
         function="Object.VisibleTakeSingle"/>
-    </menu_item_call>
-    <menu_item_call
+  </menu_item_call>
+  <menu_item_call
       enabled="false"
       label="Take copy"
       name="Take Copy">
-      <menu_item_call.on_click
+    <menu_item_call.on_click
         function="Tools.TakeCopy" />
-      <menu_item_call.on_enable
+    <menu_item_call.on_enable
         function="Tools.EnableTakeCopy" />
-      <menu_item_call.on_visible
+    <menu_item_call.on_visible
         function="Object.VisibleTakeSingle"/>
-    </menu_item_call>
+  </menu_item_call>
+  <context_menu
+    label="Take multiple"
+    name="Take Multiple">
     <menu_item_call
       label="Take as combined item"
       layout="topleft"
diff --git a/indra/newview/skins/default/xui/fr/menu_object.xml b/indra/newview/skins/default/xui/fr/menu_object.xml
index 5d498062d0..8e650e5b6c 100644
--- a/indra/newview/skins/default/xui/fr/menu_object.xml
+++ b/indra/newview/skins/default/xui/fr/menu_object.xml
@@ -38,9 +38,9 @@
 	<menu_item_call label="Faire disparaître" name="Derender"/>
 	<menu_item_call label="Faire disparaître &amp; Blacklister" name="DerenderPermanent"/>
 	<menu_item_call label="Renvoyer" name="Return..."/>
-	<context_menu label="Prendre" name="Take Submenu">
-		<menu_item_call label="Prendre" name="Pie Object Take"/>
-		<menu_item_call label="Copier" name="Take Copy"/>
+	<menu_item_call label="Prendre" name="Pie Object Take"/>
+	<menu_item_call label="Prendre une copie" name="Take Copy"/>
+	<context_menu label="Prendre plusieurs" name="Take Multiple">
 		<menu_item_call label="Le groupe" name="Take combined"/>
 		<menu_item_call label="Copie du groupe" name="Take Copy combined"/>
 		<menu_item_call label="Objets séparés" name="Take Separate"/>
diff --git a/indra/newview/skins/default/xui/it/menu_object.xml b/indra/newview/skins/default/xui/it/menu_object.xml
index 5465fe58af..c29ce7e17d 100644
--- a/indra/newview/skins/default/xui/it/menu_object.xml
+++ b/indra/newview/skins/default/xui/it/menu_object.xml
@@ -41,9 +41,9 @@
 	<menu_item_call label="De-rendi" name="Derender"/>
 	<menu_item_call label="De-rendi + lista nera" name="DerenderPermanent"/>
 	<menu_item_call label="Restituisci" name="Return..."/>
-	<context_menu label="Prendi oggetto" name="Take Submenu">
-		<menu_item_call label="Prendi" name="Pie Object Take" />
-		<menu_item_call label="Prendi copia" name="Take Copy" />
+	<menu_item_call label="Prendi" name="Pie Object Take" />
+	<menu_item_call label="Prendi copia" name="Take Copy" />
+	<context_menu label="Prendi più" name="Take Multiple">
 		<menu_item_call label="Prendi come multi-oggetto" name="Take combined" />
 		<menu_item_call label="Prendi copia come multi-oggetto" name="Take Copy combined" />
 		<menu_item_call label="Prendi come oggetti separati" name="Take Separate" />
diff --git a/indra/newview/skins/default/xui/pl/menu_object.xml b/indra/newview/skins/default/xui/pl/menu_object.xml
index fd572e72b4..af452dd186 100644
--- a/indra/newview/skins/default/xui/pl/menu_object.xml
+++ b/indra/newview/skins/default/xui/pl/menu_object.xml
@@ -41,9 +41,9 @@
 	<menu_item_call label="Derenderuj" name="Derender"/>
 	<menu_item_call label="Derenderuj + czarna lista" name="DerenderPermanent"/>
 	<menu_item_call label="Zwróć" name="Return..."/>
-	<context_menu label="Weź obiekt" name="Take Submenu">
-		<menu_item_call label="Weź" name="Pie Object Take" />
-		<menu_item_call label="Weź kopię" name="Take Copy" />
+	<menu_item_call label="Weź" name="Pie Object Take" />
+	<menu_item_call label="Weź kopię" name="Take Copy" />
+	<context_menu label="Weź kilka" name="Take Multiple">
 		<menu_item_call label="Weź jako: podniesione razem" name="Take combined" />
 		<menu_item_call label="Weź kopię jako: podniesione razem" name="Take Copy combined" />
 		<menu_item_call label="Weź jako: oddzielne obiekty" name="Take Separate" />
diff --git a/indra/newview/skins/default/xui/ru/menu_object.xml b/indra/newview/skins/default/xui/ru/menu_object.xml
index 067a6a4444..96a701696e 100644
--- a/indra/newview/skins/default/xui/ru/menu_object.xml
+++ b/indra/newview/skins/default/xui/ru/menu_object.xml
@@ -41,9 +41,9 @@
 	<menu_item_call label="Не отображать" name="Derender"/>
 	<menu_item_call label="Не отображать всегда" name="DerenderPermanent"/>
 	<menu_item_call label="Вернуть" name="Return..."/>
-	<context_menu label="Взять объект" name="Take Submenu">
-		<menu_item_call label="Взять" name="Pie Object Take"/>
-		<menu_item_call label="Взять копию" name="Take Copy"/>
+	<menu_item_call label="Взять" name="Pie Object Take"/>
+	<menu_item_call label="Взять копию" name="Take Copy"/>
+	<context_menu label="Взять несколько" name="Take Multiple">
 		<menu_item_call label="Взять как комбинированный предмет" name="Take combined"/>
 		<menu_item_call label="Взять копию как комбинированный предмет" name="Take Copy combined"/>
 		<menu_item_call label="Взять как отдельные предметы" name="Take Separate"/>