From 5684109acb63555302c82f6b5e349f9bc90a7d15 Mon Sep 17 00:00:00 2001
From: chanayane <chanayane83@gmail.com>
Date: Wed, 18 Sep 2024 00:29:56 +0200
Subject: [PATCH 01/14] Add key bindings for Camera Roll

---
 indra/newview/app_settings/key_bindings.xml   |  9 +++++++
 indra/newview/llkeyconflict.cpp               |  4 ++++
 indra/newview/llviewerinput.cpp               | 22 +++++++++++++++++
 .../xui/en/control_table_contents_camera.xml  | 24 +++++++++++++++++++
 4 files changed, 59 insertions(+)

diff --git a/indra/newview/app_settings/key_bindings.xml b/indra/newview/app_settings/key_bindings.xml
index 9a1e8e753b..94585916b9 100644
--- a/indra/newview/app_settings/key_bindings.xml
+++ b/indra/newview/app_settings/key_bindings.xml
@@ -35,6 +35,10 @@
     <binding key="E" mask="NONE" command="jump"/>
     <binding key="C" mask="NONE" command="push_down"/>
 
+<!-- <FS:Chanayane> Camera roll key bindings -->
+    <binding key="R" mask="NONE" command="roll_left"/>
+    <binding key="T" mask="NONE" command="roll_right"/>
+<!-- </FS:Chanayane> -->
     <binding key="F" mask="NONE" command="toggle_fly"/>
 
     <binding key="SPACE" mask="NONE" command="stop_moving"/>
@@ -121,6 +125,11 @@
     <binding key="E" mask="NONE" command="spin_over_sitting"/>
     <binding key="C" mask="NONE" command="spin_under_sitting"/>
 
+<!-- <FS:Chanayane> Camera roll key bindings -->
+    <binding key="R" mask="NONE" command="roll_left" />
+    <binding key="T" mask="NONE" command="roll_right" />
+<!-- </FS:Chanayane> -->
+
     <binding key="LEFT" mask="NONE" command="spin_around_cw_sitting"/>
     <binding key="RIGHT" mask="NONE" command="spin_around_ccw_sitting"/>
     <binding key="UP" mask="NONE" command="move_forward_sitting"/>
diff --git a/indra/newview/llkeyconflict.cpp b/indra/newview/llkeyconflict.cpp
index 666ab4f5d0..215714efed 100644
--- a/indra/newview/llkeyconflict.cpp
+++ b/indra/newview/llkeyconflict.cpp
@@ -813,6 +813,10 @@ void LLKeyConflictHandler::generatePlaceholders(ESourceMode load_mode)
         registerTemporaryControl("pan_out");
         registerTemporaryControl("spin_around_ccw");
         registerTemporaryControl("spin_around_cw");
+// <FS:Chanayane> Camera roll key bindings
+        registerTemporaryControl("roll_left");
+        registerTemporaryControl("roll_right");
+// </FS:Chanayane>
 
         // control_table_contents_editing.xml
         registerTemporaryControl("edit_avatar_spin_ccw");
diff --git a/indra/newview/llviewerinput.cpp b/indra/newview/llviewerinput.cpp
index 198e02db66..9fef4a6272 100644
--- a/indra/newview/llviewerinput.cpp
+++ b/indra/newview/llviewerinput.cpp
@@ -586,6 +586,24 @@ bool camera_pan_out( EKeystate s )
     return true;
 }
 
+// <FS:Chanayane> Camera roll key bindings
+bool camera_roll_left( EKeystate s )
+{
+    if( KEYSTATE_UP == s  ) return true;
+    gAgentCamera.unlockView();
+    gAgentCamera.setRollLeftKey(get_orbit_rate());
+    return true;
+}
+
+bool camera_roll_right( EKeystate s )
+{
+    if( KEYSTATE_UP == s  ) return true;
+    gAgentCamera.unlockView();
+    gAgentCamera.setRollRightKey(get_orbit_rate());
+    return true;
+}
+// </FS:Chanayane>
+
 bool camera_move_forward_fast( EKeystate s )
 {
     if( KEYSTATE_UP == s  ) return true;
@@ -1040,6 +1058,10 @@ REGISTER_KEYBOARD_ACTION("pan_left", camera_pan_left);
 REGISTER_KEYBOARD_ACTION("pan_right", camera_pan_right);
 REGISTER_KEYBOARD_ACTION("pan_in", camera_pan_in);
 REGISTER_KEYBOARD_ACTION("pan_out", camera_pan_out);
+// <FS:Chanayane> Camera roll key bindings
+REGISTER_KEYBOARD_ACTION("roll_left", camera_roll_left);
+REGISTER_KEYBOARD_ACTION("roll_right", camera_roll_right);
+// </FS:Chanayane>
 REGISTER_KEYBOARD_ACTION("move_forward_fast", camera_move_forward_fast);
 REGISTER_KEYBOARD_ACTION("move_backward_fast", camera_move_backward_fast);
 REGISTER_KEYBOARD_ACTION("edit_avatar_spin_ccw", edit_avatar_spin_ccw);
diff --git a/indra/newview/skins/default/xui/en/control_table_contents_camera.xml b/indra/newview/skins/default/xui/en/control_table_contents_camera.xml
index 74e8b9e5f9..e4f6309e34 100644
--- a/indra/newview/skins/default/xui/en/control_table_contents_camera.xml
+++ b/indra/newview/skins/default/xui/en/control_table_contents_camera.xml
@@ -175,6 +175,30 @@
          tool_tip="Camera spin around clockwise"
          value="Clockwise" />
     </rows>
+<!-- <FS:Chanayane> Camera roll key bindings -->
+    <rows
+     name="roll_left"
+     value="roll_left">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera roll left"
+         value="Roll left" />
+    </rows>
+    <rows
+     name="roll_right"
+     value="roll_right">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera roll right"
+         value="Roll right" />
+    </rows>
+<!-- </FS:Chanayane> -->
     <rows
      name="move_forward_sitting"
      value="move_forward_sitting">

From 17d9671302265065df486fb015416efbb0f4e37e Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 18 Sep 2024 12:29:58 +0200
Subject: [PATCH 02/14] Update German translation

---
 .../skins/default/xui/de/control_table_contents_camera.xml  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/indra/newview/skins/default/xui/de/control_table_contents_camera.xml b/indra/newview/skins/default/xui/de/control_table_contents_camera.xml
index 984a6aa87e..2e756448da 100644
--- a/indra/newview/skins/default/xui/de/control_table_contents_camera.xml
+++ b/indra/newview/skins/default/xui/de/control_table_contents_camera.xml
@@ -51,6 +51,12 @@
 	<rows name="spin_around_cw">
 		<columns name="lst_action" tool_tip="Kamera im Uhrzeigersinn drehen" value="Drehen (Uhrzeigersinn)" />
 	</rows>
+	<rows name="roll_left">
+		<columns name="lst_action" value="Kamera nach links rollen" />
+	</rows>
+	<rows name="roll_right">
+		<columns name="lst_action" value="Kamera nach rechts rollen" />
+	</rows>
 	<rows name="move_forward_sitting">
 		<columns name="lst_action" value="Kamera vorwärts sitzend" />
 	</rows>

From 5ebe25778d4ec6de5cf2c8e5aa99ae1235d9ae53 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 18 Sep 2024 12:36:54 +0200
Subject: [PATCH 03/14] Remove nonsense sentence

---
 doc/building_windows.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/doc/building_windows.md b/doc/building_windows.md
index 7ae61cdf5e..1e366b643f 100644
--- a/doc/building_windows.md
+++ b/doc/building_windows.md
@@ -134,8 +134,6 @@ cd \firestorm
 git clone https://github.com/FirestormViewer/phoenix-firestorm.git
 ```
 
-This can take a bit, it's a rather large download.
-
 ## Prepare third party libraries
 
 Most third party libraries needed to build the viewer will be automatically downloaded for you and installed into the build directory within your source tree during compilation. Some need to be manually prepared and are not normally required when using an open source configuration (ReleaseFS_open).

From 6d4f3c8f93e18b50b4b31b4ea024898507078c21 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Wed, 18 Sep 2024 11:48:06 +0100
Subject: [PATCH 04/14] Adjust the parameters to better match the version mgr

---
 fsutils/download_list.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fsutils/download_list.py b/fsutils/download_list.py
index 95f65f9ef1..81628ed71f 100644
--- a/fsutils/download_list.py
+++ b/fsutils/download_list.py
@@ -360,10 +360,10 @@ def update_fs_version_mgr(build_info, config):
             continue
 
         payload = {
-            "viewer_channel": channel,
+            "viewer_channel": build_type,
             "grid_type": grid,
             "operating_system": os_name,
-            "build_type": build_type.lower(),
+            "build_type": build_variant,
             "viewer_version": version,
             "build_number": int(build_number),
             "download_link": download_link,

From 7c5722fb2ef41d8f3a41bc0d81be9f23d2b51c2a Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Wed, 18 Sep 2024 13:47:43 +0200
Subject: [PATCH 05/14] FIRE-34438 Add new Take options to Pie menu

---
 .../skins/default/xui/az/menu_pie_object.xml  |  6 +-
 .../skins/default/xui/de/menu_pie_object.xml  | 10 ++-
 .../skins/default/xui/en/menu_pie_object.xml  | 90 +++++++++++++++----
 .../skins/default/xui/es/menu_pie_object.xml  |  6 +-
 .../skins/default/xui/fr/menu_pie_object.xml  |  6 +-
 .../skins/default/xui/it/menu_pie_object.xml  | 10 ++-
 .../skins/default/xui/ja/menu_pie_object.xml  | 14 ++-
 .../skins/default/xui/pl/menu_pie_object.xml  | 12 ++-
 .../skins/default/xui/ru/menu_pie_object.xml  | 10 ++-
 9 files changed, 123 insertions(+), 41 deletions(-)

diff --git a/indra/newview/skins/default/xui/az/menu_pie_object.xml b/indra/newview/skins/default/xui/az/menu_pie_object.xml
index cacb9c7d1d..00598b3d85 100644
--- a/indra/newview/skins/default/xui/az/menu_pie_object.xml
+++ b/indra/newview/skins/default/xui/az/menu_pie_object.xml
@@ -6,12 +6,14 @@
 	<pie_slice label="Otur" name="Pie Object Sit"/>
 	<pie_slice label="Dur" name="Object Stand Up"/>
 	<pie_slice label="Al" name="Buy..."/>
-	<pie_slice label="Götür" name="Pie Object Take"/>
+	<pie_menu label="Götür &gt;" name="Take Submenu">
+		<pie_slice label="Götür" name="Take" />
+		<pie_slice label="Köçürtməsin götür" name="Take Copy" />
+	</pie_menu>
 	<pie_slice label="Ödə" name="Pay..."/>
 	<pie_menu label="İrəli &gt;" name="Object Pie More 1">
 		<pie_slice label="Sil" name="Delete"/>
 		<pie_slice label="Geyin" name="Wear"/>
-		<pie_slice label="Köçürtməsin götür" name="Take Copy"/>
 		<pie_menu label="HUD Əlavə et &gt;" name="Pie Object Attach HUD" />
 		<pie_menu label="Birləşdir &gt;" name="Pie Object Attach">
 			<pie_menu label="Əlv.Skelet &gt;" name="Enhanced Skeleton">
diff --git a/indra/newview/skins/default/xui/de/menu_pie_object.xml b/indra/newview/skins/default/xui/de/menu_pie_object.xml
index 2dbb6e8975..14933a9105 100644
--- a/indra/newview/skins/default/xui/de/menu_pie_object.xml
+++ b/indra/newview/skins/default/xui/de/menu_pie_object.xml
@@ -6,12 +6,18 @@
 	<pie_slice label="Hier sitzen" name="Pie Object Sit"/>
 	<pie_slice label="Aufstehen" name="Object Stand Up"/>
 	<pie_slice label="Kaufen" name="Buy..."/>
-	<pie_slice label="Nehmen" name="Pie Object Take"/>
+	<pie_menu label="Nehmen &gt;" name="Take Submenu">
+		<pie_slice label="Nehmen" name="Take" />
+		<pie_slice label="Kopie nehmen" name="Take Copy" />
+		<pie_slice label="Als kombiniertes Objekt" name="Take combined" />
+		<pie_slice label="Kopie als kombiniertes Objekt" name="Take Copy combined" />
+		<pie_slice label="Als separate Objekte" name="Take Separate" />
+		<pie_slice label="Kopien als separate Objekte" name="Take Copy Separate" />
+	</pie_menu>
 	<pie_slice label="Zahlen" name="Pay..."/>
 	<pie_menu label="Mehr &gt;" name="Object Pie More 1">
 		<pie_slice label="Löschen" name="Delete"/>
 		<pie_slice label="Anziehen" name="Wear"/>
-		<pie_slice label="Kopie nehmen" name="Take Copy"/>
 		<pie_menu label="HUD anhängen &gt;" name="Pie Object Attach HUD"/>
 		<pie_menu label="Anhängen &gt;" name="Pie Object Attach">
 			<pie_menu label="Erw. Skelett &gt;" name="Enhanced Skeleton">
diff --git a/indra/newview/skins/default/xui/en/menu_pie_object.xml b/indra/newview/skins/default/xui/en/menu_pie_object.xml
index c384fe9953..047fee9532 100644
--- a/indra/newview/skins/default/xui/en/menu_pie_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_pie_object.xml
@@ -58,15 +58,78 @@
         <pie_slice.on_enable
             function="Object.EnableBuy" />
     </pie_slice>
-    <pie_slice
-        autohide="true"
-        label="Take"
-        name="Pie Object Take">
-        <pie_slice.on_click
-            function="Object.Take"/>
-        <pie_slice.on_enable
-            function="Object.VisibleTake"/>
-    </pie_slice>
+
+    <pie_menu
+        label="Take &gt;"
+        name="Take Submenu">
+        <pie_slice
+         enabled="false"
+         label="Take"
+         name="Take">
+            <pie_slice.on_click
+             function="Object.Take"/>
+            <pie_slice.on_enable
+             function="Object.VisibleTake"/>
+            <pie_slice.on_visible
+             function="Object.VisibleTakeSingle"/>
+        </pie_slice>
+        <pie_slice
+         enabled="false"
+         label="Take copy"
+         name="Take Copy">
+            <pie_slice.on_click
+             function="Tools.TakeCopy"/>
+            <pie_slice.on_enable
+             function="Tools.EnableTakeCopy"/>
+            <pie_slice.on_visible
+             function="Object.VisibleTakeSingle"/>
+        </pie_slice>
+        <pie_slice
+         enabled="false"
+         label="As combined item"
+         name="Take combined">
+            <pie_slice.on_click
+             function="Object.Take"/>
+            <pie_slice.on_enable
+             function="Object.VisibleTake"/>
+            <pie_slice.on_visible
+             function="Object.VisibleTakeMultiple"/>
+        </pie_slice>
+        <pie_slice
+         enabled="false"
+         label="Copy as combined item"
+         name="Take Copy combined">
+            <pie_slice.on_click
+             function="Tools.TakeCopy"/>
+            <pie_slice.on_enable
+             function="Tools.EnableTakeCopy"/>
+            <pie_slice.on_visible
+             function="Object.VisibleTakeMultiple"/>
+        </pie_slice>
+        <pie_slice
+         enabled="false"
+         label="As separate items"
+         name="Take Separate">
+            <pie_slice.on_click
+             function="Object.TakeSeparate"/>
+            <pie_slice.on_enable
+             function="Object.EnableTakeMultiple"/>
+            <pie_slice.on_visible
+             function="Object.VisibleTakeMultiple"/>
+        </pie_slice>
+        <pie_slice
+         enabled="false"
+         label="Copies as separate items"
+         name="Take Copy Separate">
+            <pie_slice.on_click
+             function="Object.TakeSeparateCopy"/>
+            <pie_slice.on_enable
+             function="Tools.EnableCopySeparate"/>
+            <pie_slice.on_visible
+             function="Object.VisibleTakeMultiple"/>
+        </pie_slice>
+    </pie_menu>
+
     <pie_slice
         enabled="false"
         label="Pay"
@@ -99,15 +162,6 @@
         <pie_slice.on_enable
             function="Object.EnableWear" />
     </pie_slice>
-    <pie_slice
-        enabled="false"
-        label="Take Copy"
-        name="Take Copy">
-        <pie_slice.on_click
-            function="Tools.TakeCopy" />
-        <pie_slice.on_enable
-            function="Tools.EnableTakeCopy" />
-    </pie_slice>
     <pie_menu
         label="Attach HUD &gt;"
         name="Pie Object Attach HUD" />
diff --git a/indra/newview/skins/default/xui/es/menu_pie_object.xml b/indra/newview/skins/default/xui/es/menu_pie_object.xml
index 735648d129..6a869f014b 100644
--- a/indra/newview/skins/default/xui/es/menu_pie_object.xml
+++ b/indra/newview/skins/default/xui/es/menu_pie_object.xml
@@ -6,12 +6,14 @@
 	<pie_slice label="Sentarme" name="Pie Object Sit"/>
 	<pie_slice label="Levantarme" name="Object Stand Up"/>
 	<pie_slice label="Comprar" name="Buy..."/>
-	<pie_slice label="Tomar" name="Pie Object Take"/>
+	<pie_menu label="Tomar &gt;" name="Take Submenu">
+		<pie_slice label="Tomar" name="Take" />
+		<pie_slice label="Tomar una copia" name="Take Copy" />
+	</pie_menu>
 	<pie_slice label="Pagar" name="Pay..."/>
 	<pie_menu label="Más &gt;" name="Object Pie More 1">
 		<pie_slice label="Eliminar" name="Delete"/>
 		<pie_slice label="Vestir" name="Wear"/>
-		<pie_slice label="Tomar una copia" name="Take Copy"/>
 		<pie_menu label="Anexar HUD &gt;" name="Pie Object Attach HUD"/>
 		<pie_menu label="Anexar &gt;" name="Pie Object Attach"/>
 		<pie_slice label="Devolver" name="Return..."/>
diff --git a/indra/newview/skins/default/xui/fr/menu_pie_object.xml b/indra/newview/skins/default/xui/fr/menu_pie_object.xml
index 3470749220..7f2d74931e 100644
--- a/indra/newview/skins/default/xui/fr/menu_pie_object.xml
+++ b/indra/newview/skins/default/xui/fr/menu_pie_object.xml
@@ -6,12 +6,14 @@
 	<pie_slice label="S'asseoir" name="Pie Object Sit"/>
 	<pie_slice label="Se lever" name="Object Stand Up"/>
 	<pie_slice label="Acheter" name="Buy..."/>
-	<pie_slice label="Prendre" name="Pie Object Take"/>
+	<pie_menu label="Prendre &gt;" name="Take Submenu">
+		<pie_slice label="Prendre" name="Take" />
+		<pie_slice label="Prendre une copie" name="Take Copy" />
+	</pie_menu>
 	<pie_slice label="Payer" name="Pay..."/>
 	<pie_menu label="Plus &gt;" name="Object Pie More 1">
 		<pie_slice label="Supprimer" name="Delete"/>
 		<pie_slice label="Porter" name="Wear"/>
-		<pie_slice label="Prendre une copie" name="Take Copy"/>
 		<pie_menu label="Attacher au HUD &gt;" name="Pie Object Attach HUD"/>
 		<pie_menu label="Attacher &gt;" name="Pie Object Attach">
 			<pie_menu label="Squelette (ext) &gt;" name="Enhanced Skeleton">
diff --git a/indra/newview/skins/default/xui/it/menu_pie_object.xml b/indra/newview/skins/default/xui/it/menu_pie_object.xml
index 0e8f06ede0..67c0efa101 100644
--- a/indra/newview/skins/default/xui/it/menu_pie_object.xml
+++ b/indra/newview/skins/default/xui/it/menu_pie_object.xml
@@ -6,12 +6,18 @@
 	<pie_slice label="Siediti qui" name="Pie Object Sit"/>
 	<pie_slice label="Alzati" name="Object Stand Up"/>
 	<pie_slice label="Compra" name="Buy..."/>
-	<pie_slice label="Prendi" name="Pie Object Take"/>
+	<pie_menu label="Prendi &gt;" name="Take Submenu">
+		<pie_slice label="Prendi" name="Take" />
+		<pie_slice label="Prendi copia" name="Take Copy" />
+		<pie_slice label="Come multi-oggetto" name="Take combined" />
+		<pie_slice label="Copia come multi-oggetto" name="Take Copy combined" />
+		<pie_slice label="Come oggetti separati" name="Take Separate" />
+		<pie_slice label="Copie come oggetti separati" name="Take Copy Separate" />
+	</pie_menu>
 	<pie_slice label="Paga" name="Pay..."/>
 	<pie_menu label="Altro &gt;" name="Object Pie More 1">
 		<pie_slice label="Elimina" name="Delete"/>
 		<pie_slice label="Indossa" name="Wear"/>
-		<pie_slice label="Prendi copia" name="Take Copy"/>
 		<pie_menu label="Attacca HUD &gt;" name="Pie Object Attach HUD"/>
 		<pie_menu label="Attacca &gt;" name="Pie Object Attach">
 			<pie_menu label="Schel. avanz. &gt;" name="Enhanced Skeleton">
diff --git a/indra/newview/skins/default/xui/ja/menu_pie_object.xml b/indra/newview/skins/default/xui/ja/menu_pie_object.xml
index f959fe19ac..ebdc8d9a07 100644
--- a/indra/newview/skins/default/xui/ja/menu_pie_object.xml
+++ b/indra/newview/skins/default/xui/ja/menu_pie_object.xml
@@ -19,12 +19,13 @@
     <pie_slice
         label="購入"
         name="Buy..."/>
-    <pie_slice
-        label="取る"
-        name="Pie Object Take"/>
+    <pie_menu label="取る &gt;" name="Take Submenu">
+        <pie_slice label="取る" name="Take" />
+        <pie_slice label="コピーを取る" name="Take Copy" />
+    </pie_menu>
     <pie_slice
         label="支払い" 
-		name="Pay..."/>
+        name="Pay..."/>
     <pie_menu
         label="詳細 &gt;"
         name="Object Pie More 1">
@@ -34,9 +35,6 @@
     <pie_slice
         label="装着"
         name="Wear"/>
-    <pie_slice
-        label="コピーを取る"
-        name="Take Copy"/>
     <pie_menu
         label="HUD装着先 &gt;"
         name="Pie Object Attach HUD" />
@@ -45,7 +43,7 @@
         name="Pie Object Attach" />
     <pie_slice
         label="返却" 
-		name="Return..."/>
+        name="Return..."/>
     <pie_menu
         label="詳細 &gt;"
         name="Object Pie More 2">
diff --git a/indra/newview/skins/default/xui/pl/menu_pie_object.xml b/indra/newview/skins/default/xui/pl/menu_pie_object.xml
index 21c5f6a7d3..a6d38c6add 100644
--- a/indra/newview/skins/default/xui/pl/menu_pie_object.xml
+++ b/indra/newview/skins/default/xui/pl/menu_pie_object.xml
@@ -1,17 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <pie_menu name="Object Pie">
 	<pie_slice label="Otwórz" name="Open"/>
-	<pie_slice label="Stwórz" name="Build"/>
+	<pie_slice label="Edytuj" name="Build"/>
 	<pie_slice label="Dotknij" name="Pie Object Touch"/>
 	<pie_slice label="Usiądź tutaj" name="Pie Object Sit"/>
 	<pie_slice label="Wstań" name="Object Stand Up"/>
 	<pie_slice label="Kup" name="Buy..."/>
-	<pie_slice label="Weź" name="Pie Object Take"/>
+	<pie_menu label="Weź &gt;" name="Take Submenu">
+		<pie_slice label="Weź" name="Take" />
+		<pie_slice label="Weź kopię" name="Take Copy" />
+		<pie_slice label="Jako: podniesione razem" name="Take combined" />
+		<pie_slice label="Kopię jako: podniesione razem" name="Take Copy combined" />
+		<pie_slice label="Jako: oddzielne obiekty" name="Take Separate" />
+		<pie_slice label="Kopie jako: oddzielne obiekty" name="Take Copy Separate" />
+	</pie_menu>
 	<pie_slice label="Zapłać" name="Pay..."/>
 	<pie_menu label="Więcej &gt;" name="Object Pie More 1">
 		<pie_slice label="Usuń" name="Delete"/>
 		<pie_slice label="Załóż" name="Wear"/>
-		<pie_slice label="Weź kopię" name="Take Copy"/>
 		<pie_menu label="Dołącz HUD &gt;" name="Pie Object Attach HUD"/>
 		<pie_menu label="Dołącz &gt;" name="Pie Object Attach">
 			<pie_menu label="Roz. szkielet &gt;" name="Enhanced Skeleton">
diff --git a/indra/newview/skins/default/xui/ru/menu_pie_object.xml b/indra/newview/skins/default/xui/ru/menu_pie_object.xml
index 93238bda76..93a3945585 100644
--- a/indra/newview/skins/default/xui/ru/menu_pie_object.xml
+++ b/indra/newview/skins/default/xui/ru/menu_pie_object.xml
@@ -6,12 +6,18 @@
 	<pie_slice label="Сесть" name="Pie Object Sit"/>
 	<pie_slice label="Встать" name="Object Stand Up"/>
 	<pie_slice label="Купить" name="Buy..."/>
-	<pie_slice label="Взять" name="Pie Object Take"/>
+	<pie_menu label="Взять &gt;" name="Take Submenu">
+		<pie_slice label="Взять" name="Take" />
+		<pie_slice label="Взять Копию" name="Take Copy" />
+		<pie_slice label="Как комбинированный предмет" name="Take combined" />
+		<pie_slice label="Копию как комбинированный предмет" name="Take Copy combined" />
+		<pie_slice label="Как отдельные предметы" name="Take Separate" />
+		<pie_slice label="Копии как отдельные предметы" name="Take Copy Separate" />
+	</pie_menu>
 	<pie_slice label="Заплатить" name="Pay..."/>
 	<pie_menu label="Далее &gt;" name="Object Pie More 1">
 		<pie_slice label="Удалить" name="Delete"/>
 		<pie_slice label="Надеть" name="Wear"/>
-		<pie_slice label="Взять Копию" name="Take Copy"/>
 		<pie_menu label="Добавить HUD &gt;" name="Pie Object Attach HUD" />
 		<pie_menu label="Прикрепить &gt;" name="Pie Object Attach">
 			<pie_menu label="Доп.Скелет &gt;" name="Enhanced Skeleton">

From 51092906edbb698cb2880b9d6264480bee6c9815 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Wed, 18 Sep 2024 13:48:17 +0200
Subject: [PATCH 06/14] Minor alteration in Italian translation

---
 .../skins/default/xui/it/panel_preferences_graphics1.xml       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
index b9d40ce747..c22aaa2796 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
@@ -148,7 +148,8 @@
 			</combo_box>
 			<text name="FSRestrictMaxTextureSizeRestartText">
 				(richiede riavvio)
-			</text>			<text name="TextureDetailLabel">
+			</text>
+			<text name="TextureDetailLabel">
 				Max livello qualità texture:
 			</text>
 			<combo_box name="TextureDetail">

From 788d61f4b1f4f40945f2f3c628d02187f540d083 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Wed, 18 Sep 2024 14:52:44 +0200
Subject: [PATCH 07/14] Updated Polish translation

---
 .../xui/pl/control_table_contents_camera.xml  |  6 +++
 .../default/xui/pl/floater_bulk_upload.xml    | 33 ++++++++++++++++
 .../xui/pl/floater_gltf_asset_editor.xml      | 24 ++++++++++++
 .../pl/floater_region_restart_schedule.xml    | 39 +++++++++++++++++++
 .../default/xui/pl/floater_settings_color.xml | 13 +++++++
 .../skins/default/xui/pl/menu_login.xml       |  1 +
 .../skins/default/xui/pl/menu_viewer.xml      |  9 ++++-
 .../skins/default/xui/pl/notifications.xml    | 17 ++++++++
 .../default/xui/pl/panel_region_debug.xml     |  2 +-
 .../default/xui/pl/panel_region_general.xml   |  1 +
 10 files changed, 143 insertions(+), 2 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/pl/floater_bulk_upload.xml
 create mode 100644 indra/newview/skins/default/xui/pl/floater_gltf_asset_editor.xml
 create mode 100644 indra/newview/skins/default/xui/pl/floater_region_restart_schedule.xml
 create mode 100644 indra/newview/skins/default/xui/pl/floater_settings_color.xml

diff --git a/indra/newview/skins/default/xui/pl/control_table_contents_camera.xml b/indra/newview/skins/default/xui/pl/control_table_contents_camera.xml
index 95a2e0acee..5432b2635b 100644
--- a/indra/newview/skins/default/xui/pl/control_table_contents_camera.xml
+++ b/indra/newview/skins/default/xui/pl/control_table_contents_camera.xml
@@ -51,6 +51,12 @@
 	<rows name="spin_around_cw">
 		<columns name="lst_action" tool_tip="Obrót kamery zgodnie z ruchem wskazówek zegara." value="Obrót kamery w lewo" />
 	</rows>
+	<rows name="roll_left">
+		<columns name="lst_action" tool_tip="Przechyl kamerę w lewo" value="Przechyl w lewo" />
+	</rows>
+	<rows name="roll_right">
+		<columns name="lst_action" tool_tip="Przechyl kamerę w prawo" value="Przechyl w prawo" />
+	</rows>
 	<rows name="move_forward_sitting">
 		<columns name="lst_action" value="Kamera w przód siedząc" />
 	</rows>
diff --git a/indra/newview/skins/default/xui/pl/floater_bulk_upload.xml b/indra/newview/skins/default/xui/pl/floater_bulk_upload.xml
new file mode 100644
index 0000000000..3d19afaa7b
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_bulk_upload.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="bulk_upload">
+	<layout_stack name="maint_layout">
+		<layout_panel name="count_panel">
+			<text name="number_of_items">
+				Elementy do przesłania: [COUNT]
+			</text>
+		</layout_panel>
+		<layout_panel name="warning_panel">
+			<text name="textures_2k_warning">
+				Domyślnie jedna lub więcej tekstur zostanie przeskalowanych do 2048px.
+			</text>
+		</layout_panel>
+		<layout_panel name="checkbox_panel">
+			<check_box label="Skaluj tekstury do maksymalnie 1024px" name="upload_2k" />
+		</layout_panel>
+		<layout_panel name="cost_panel">
+			<text name="upload_cost">
+				Koszt: [COST]L$
+			</text>
+		</layout_panel>
+		<layout_panel name="buttoms_panel">
+			<button label="Prześlij" name="upload_btn" />
+			<button label="Anuluj" name="cancel_btn" />
+		</layout_panel>
+		<layout_panel name="link_panel">
+			<text name="new_folder_textbox">
+Jak skalowane są przesyłane tekstury:
+https://wiki.secondlife.com/wiki/Limits#All_Viewers
+			</text>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_gltf_asset_editor.xml b/indra/newview/skins/default/xui/pl/floater_gltf_asset_editor.xml
new file mode 100644
index 0000000000..28f4d0b52a
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_gltf_asset_editor.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="gltf asset editor">
+	<floater.string name="floater_title" value="Edytor scen GLTF" />
+	<floater.string name="scene_tittle" value="Scena" />
+	<floater.string name="node_tittle" value="Węzeł" />
+	<floater.string name="mesh_tittle" value="Mesz" />
+	<floater.string name="skin_tittle" value="Skórka" />
+	<layout_stack name="main_layout">
+		<layout_panel name="transforms_panel">
+			<menu_button name="clipboard_pos_btn" tool_tip="Opcje wklejania" />
+			<text name="label position" tool_tip="Pozycja (metry)">
+				Pozycja (m)
+			</text>
+			<menu_button name="clipboard_size_btn" tool_tip="Opcje wklejania" />
+			<text name="label size" tool_tip="Rozmiar (metry)">
+				Rozmiar (m)
+			</text>
+			<menu_button name="clipboard_rot_btn" tool_tip="Opcje wklejania" />
+			<text name="label rotation" tool_tip="Obrót (stopnie)">
+				Obrót (°)
+			</text>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_region_restart_schedule.xml b/indra/newview/skins/default/xui/pl/floater_region_restart_schedule.xml
new file mode 100644
index 0000000000..0fe894707a
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_region_restart_schedule.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_region_restart_schedule" title="Planowanie restartów regionu">
+	<text name="days_general">
+		Restartuj region w tych dniach:
+	</text>
+	<check_box name="s_chk" tool_tip="Niedziela" />
+	<check_box name="m_chk" tool_tip="Poniedziałek" />
+	<check_box name="t_chk" tool_tip="Wtorek" />
+	<check_box name="w_chk" tool_tip="Środa" />
+	<check_box name="r_chk" tool_tip="Czwartek" />
+	<check_box name="f_chk" tool_tip="Piątek" />
+	<check_box name="a_chk" tool_tip="Sobota" />
+	<text name="su_label">
+		Nd
+	</text>
+	<text name="mo_label">
+		Pn
+	</text>
+	<text name="tu_label">
+		Wt
+	</text>
+	<text name="we_label">
+		Śr
+	</text>
+	<text name="th_label">
+		Cz
+	</text>
+	<text name="fr_label">
+		Pt
+	</text>
+	<text name="sa_label">
+		So
+	</text>
+	<text name="at_label">
+		o
+	</text>
+	<button name="save_btn" label="Zapisz" />
+	<button name="cancel_btn" label="Anuluj" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_settings_color.xml b/indra/newview/skins/default/xui/pl/floater_settings_color.xml
new file mode 100644
index 0000000000..4e784f72d8
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_settings_color.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="settings_color" title="Ustawienia kolorów">
+	<filter_editor label="Tekst wyszukiwania" name="filter_input" />
+	<scroll_list name="setting_list">
+		<scroll_list.columns label="Kolor" name="color" />
+	</scroll_list>
+	<text name="color_name_txt">
+		Nazwa koloru
+	</text>
+	<spinner label="Przezr." name="alpha_spinner" />
+	<button label="Przywróć domyślne" name="default_btn" />
+	<check_box label="Pokaż tylko zmienione" name="hide_default" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/menu_login.xml b/indra/newview/skins/default/xui/pl/menu_login.xml
index d2da6466e4..c16d99f4b2 100644
--- a/indra/newview/skins/default/xui/pl/menu_login.xml
+++ b/indra/newview/skins/default/xui/pl/menu_login.xml
@@ -24,6 +24,7 @@
 	<menu_item_check label="Pokaż menu debugowania" name="Show Debug Menu"/>
 	<menu label="Debugowanie" name="Debug">
 		<menu_item_call label="Pokaż ustawienia debugowania" name="Debug Settings"/>
+		<menu_item_call label="Pokaż ustawienia kolorów" name="Color Settings" />
 		<menu_item_call label="Narzędzie podglądu XUI" name="UI Preview Tool"/>
 		<menu label="Czcionki" name="Fonts">
 			<menu_item_call label="Pokaż test czcionek" name="Show Font Test" />
diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml
index d371227689..9764c3c0e9 100644
--- a/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -469,6 +469,7 @@
 			<menu_item_call label="Otwórz..." name="Open..." />
 			<menu_item_call label="Zapisz jako..." name="Save As..." />
 			<menu_item_call label="Prześlij..." name="Upload..." />
+			<menu_item_call label="Edytuj..." name="Edit..." />
 		</menu>
 		<menu label="Wideo" name="Video" />
 		<menu label="Testy renderowania" name="Render Tests">
@@ -533,7 +534,6 @@
 			<menu_item_check label="Renderowanie przyłączonych cząsteczek" name="Render Attached Particles"/>
 			<menu_item_check label="Pamięć podręczna modułu cieniującego" name="Enable Shader Cache" />
 			<menu_item_call label="Wyczyść pamięć podręczną modułu cieniującego" name="Shader Cache Clear" />
-			<menu_item_call label="Odbuduj teren" name="Rebuild Terrain" />
 		</menu>
 		<menu label="Sieć" name="Network">
 			<menu_item_check label="Zatrzymaj awatara" name="AgentPause"/>
@@ -566,6 +566,11 @@
 			<menu_item_call label="Interest List: Resetowanie" name="Reset Interest Lists" />
 			<menu_item_call label="Zrzut właściwości symulatora do czatu w pobliżu" name="DumpSimFeaturesToChat"/>
 		</menu>
+		<menu label="Teren" name="DevelopTerrain">
+			<menu_item_call label="Odbuduj teren" name="Rebuild Terrain" />
+			<menu_item_call label="Utwórz lokalną mapę malowania (paintmapę)" name="Create Local Paintmap" />
+			<menu_item_call label="Usuń lokalną mapę malowania (paintmapę)" name="Delete Local Paintmap" />
+		</menu>
 		<menu label="Interfejs" name="UI">
 			<menu_item_call label="Test przeglądarki mediów" name="Web Browser Test"/>
 			<menu_item_check label="Test restartu regionu" name="Region Restart Test"/>
@@ -592,6 +597,7 @@
 			<menu_item_check label="Debuguj procesy okien" name="Debug WindowProc"/>
 		</menu>
 		<menu label="XUI/XML" name="XUI">
+			<menu_item_call label="Pokaż ustawienia kolorów" name="Color Settings" />
 			<menu_item_call label="Przeładuj ustawienia koloru" name="Reload Color Settings"/>
 			<menu_item_call label="Pokaż test czcionki" name="Show Font Test"/>
 			<menu_item_call label="Wczytaj z XML" name="Load from XML"/>
@@ -616,6 +622,7 @@
 				<menu_item_call label="Testowy mężczyzna" name="Test Male"/>
 				<menu_item_call label="Testowa kobieta" name="Test Female"/>
 				<menu_item_check label="Pozwól na zaznaczanie awatarów" name="Allow Select Avatar"/>
+				<menu_item_check label="Wyłącz animację celów spojrzeń" name="Disable Look At Animation" />
 				<menu_item_check label="Renderuj tylko znajomych" name="Render Only Friends" />
 			</menu>
 			<menu label="Szybkość animacji" name="Animation Speed">
diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml
index 28eb2e5525..3119bf93f3 100644
--- a/indra/newview/skins/default/xui/pl/notifications.xml
+++ b/indra/newview/skins/default/xui/pl/notifications.xml
@@ -871,6 +871,16 @@ To może się zdarzyć, kiedy zmieniasz ustawienia sieci. Zrestartowanie Przegl
 	<notification name="CannotUploadReason">
 		Przesyłanie pliku [FILE] nie powiodło się z powodu: [REASON]
 Spróbuj jeszcze raz później.
+	</notification>
+	<notification name="CannotUploadSnapshotEmailTooBig">
+		Przesyłanie zdjęcia [FILE] nie powiodło się z powodu: [REASON]
+
+Plik może być za duży. Spróbuj zmniejszyć rozdzielczość, jakość lub spróbować ponownie później.
+	</notification>
+	<notification name="CannotUploadSnapshotWebTooBig">
+		Przesyłanie zdjęcia nie powiodło się.
+
+Plik może być za duży. Spróbuj zmniejszyć rozdzielczość, jakość lub spróbować ponownie później.
 	</notification>
 	<notification name="LandmarkCreated">
 		Dodano "[LANDMARK_NAME]" do folderu [FOLDER_NAME].
@@ -1169,6 +1179,9 @@ Połączyć działki?
 		Nie można zapisać [NAME] w centralnym zbiorze danych.
 Zazwyczaj jest to tymczasowy problem. Możesz kontynuować modyfikacje i zapisać strój ponownie za kilka minut.
 	</notification>
+	<notification name="OutOfDiskSpace">
+		Zabrakło miejsca na dysku. Musisz zwolnić trochę miejsca na komputerze lub wyczyścić pamięć podręczną.
+	</notification>
 	<notification name="YouHaveBeenLoggedOut">
 		Nastąpiło wylogowanie z [CURRENT_GRID]
 [MESSAGE]
@@ -1671,6 +1684,10 @@ Zamień materiał [MATERIAL_NUM] na materiał z alphaMode="OPAQUE" lub alphaMode
 	<notification name="CanNotChangeAppearanceUntilLoaded">
 		Nie możesz zmienić wyglądu podczas ładowania ubrań i kształtu.
 	</notification>
+	<notification name="UsavedWearableChanges">
+		Masz niezapisane zmiany.
+		<usetemplate ignoretext="Potwierdź przed odrzuceniem niezapisanych zmian w ubraniach" name="okcancelignore" notext="Kontynuuj edycję" yestext="Odrzuć" />
+	</notification>
 	<notification name="ClassifiedMustBeAlphanumeric">
 		Tytuł Twojej reklamy musi zaczynać się od litery (A-Z) albo cyfry. Znaki przestankowe są niedozwolone.
 	</notification>
diff --git a/indra/newview/skins/default/xui/pl/panel_region_debug.xml b/indra/newview/skins/default/xui/pl/panel_region_debug.xml
index 70b0eea0dd..1e955fe598 100644
--- a/indra/newview/skins/default/xui/pl/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/pl/panel_region_debug.xml
@@ -21,7 +21,7 @@
 		Opcje:
 	</text>
 	<check_box label="Ze skryptami" name="return_scripts" tool_tip="Odeślij wyłącznie obiekty ze skryptami"/>
-	<check_box label="Wyłącznie obiekty, które są na działkach innych osób" name="return_other_land" tool_tip="Odeślij wyłącznie obiekty, które są na działkach innych osób"/>
+	<check_box label="Wyłącznie obiekty, które są na działkach innych osób" name="return_other_land" tool_tip="Odeślij wyłącznie obiekty, które nie należą do wybranego użytkownika"/>
 	<check_box label="W każdym regionie tego majątku" name="return_estate_wide" tool_tip="Odeślij obiekty z wszystkich regionów w tym majątku"/>
 	<button label="Zwróć" name="return_btn"/>
 	<button label="Szczytowe kolizje" name="top_colliders_btn" tool_tip="Lista obiektów doświadczających najwięcej potencjalnych kolizji"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_region_general.xml b/indra/newview/skins/default/xui/pl/panel_region_general.xml
index 0c37e212f0..15eb964427 100644
--- a/indra/newview/skins/default/xui/pl/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/pl/panel_region_general.xml
@@ -40,4 +40,5 @@
 	<button label="Teleportuj do Startu wszystkich Rezydentów" name="kick_all_btn"/>
 	<button label="Wyślij wiadomość do Regionu" name="im_btn"/>
 	<button label="Obsługa teleportera" name="manage_telehub_btn"/>
+	<button label="Planowanie restartów..." name="manage_restart_btn" />
 </panel>

From 0840d3253cb2d472554b2c4555a6ef4b8b2c48c8 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Wed, 18 Sep 2024 19:06:26 +0200
Subject: [PATCH 08/14] Revert "FIRE-34438 Add new Take options to Pie menu"
 Doesn't work as expected without PieSlice's autohide being accessible for
 PieMenu. This reverts commit 7c5722fb2ef41d8f3a41bc0d81be9f23d2b51c2a.

---
 .../skins/default/xui/az/menu_pie_object.xml  |  6 +-
 .../skins/default/xui/de/menu_pie_object.xml  | 10 +--
 .../skins/default/xui/en/menu_pie_object.xml  | 90 ++++---------------
 .../skins/default/xui/es/menu_pie_object.xml  |  6 +-
 .../skins/default/xui/fr/menu_pie_object.xml  |  6 +-
 .../skins/default/xui/it/menu_pie_object.xml  | 10 +--
 .../skins/default/xui/ja/menu_pie_object.xml  | 14 +--
 .../skins/default/xui/pl/menu_pie_object.xml  | 12 +--
 .../skins/default/xui/ru/menu_pie_object.xml  | 10 +--
 9 files changed, 41 insertions(+), 123 deletions(-)

diff --git a/indra/newview/skins/default/xui/az/menu_pie_object.xml b/indra/newview/skins/default/xui/az/menu_pie_object.xml
index 00598b3d85..cacb9c7d1d 100644
--- a/indra/newview/skins/default/xui/az/menu_pie_object.xml
+++ b/indra/newview/skins/default/xui/az/menu_pie_object.xml
@@ -6,14 +6,12 @@
 	<pie_slice label="Otur" name="Pie Object Sit"/>
 	<pie_slice label="Dur" name="Object Stand Up"/>
 	<pie_slice label="Al" name="Buy..."/>
-	<pie_menu label="Götür &gt;" name="Take Submenu">
-		<pie_slice label="Götür" name="Take" />
-		<pie_slice label="Köçürtməsin götür" name="Take Copy" />
-	</pie_menu>
+	<pie_slice label="Götür" name="Pie Object Take"/>
 	<pie_slice label="Ödə" name="Pay..."/>
 	<pie_menu label="İrəli &gt;" name="Object Pie More 1">
 		<pie_slice label="Sil" name="Delete"/>
 		<pie_slice label="Geyin" name="Wear"/>
+		<pie_slice label="Köçürtməsin götür" name="Take Copy"/>
 		<pie_menu label="HUD Əlavə et &gt;" name="Pie Object Attach HUD" />
 		<pie_menu label="Birləşdir &gt;" name="Pie Object Attach">
 			<pie_menu label="Əlv.Skelet &gt;" name="Enhanced Skeleton">
diff --git a/indra/newview/skins/default/xui/de/menu_pie_object.xml b/indra/newview/skins/default/xui/de/menu_pie_object.xml
index 14933a9105..2dbb6e8975 100644
--- a/indra/newview/skins/default/xui/de/menu_pie_object.xml
+++ b/indra/newview/skins/default/xui/de/menu_pie_object.xml
@@ -6,18 +6,12 @@
 	<pie_slice label="Hier sitzen" name="Pie Object Sit"/>
 	<pie_slice label="Aufstehen" name="Object Stand Up"/>
 	<pie_slice label="Kaufen" name="Buy..."/>
-	<pie_menu label="Nehmen &gt;" name="Take Submenu">
-		<pie_slice label="Nehmen" name="Take" />
-		<pie_slice label="Kopie nehmen" name="Take Copy" />
-		<pie_slice label="Als kombiniertes Objekt" name="Take combined" />
-		<pie_slice label="Kopie als kombiniertes Objekt" name="Take Copy combined" />
-		<pie_slice label="Als separate Objekte" name="Take Separate" />
-		<pie_slice label="Kopien als separate Objekte" name="Take Copy Separate" />
-	</pie_menu>
+	<pie_slice label="Nehmen" name="Pie Object Take"/>
 	<pie_slice label="Zahlen" name="Pay..."/>
 	<pie_menu label="Mehr &gt;" name="Object Pie More 1">
 		<pie_slice label="Löschen" name="Delete"/>
 		<pie_slice label="Anziehen" name="Wear"/>
+		<pie_slice label="Kopie nehmen" name="Take Copy"/>
 		<pie_menu label="HUD anhängen &gt;" name="Pie Object Attach HUD"/>
 		<pie_menu label="Anhängen &gt;" name="Pie Object Attach">
 			<pie_menu label="Erw. Skelett &gt;" name="Enhanced Skeleton">
diff --git a/indra/newview/skins/default/xui/en/menu_pie_object.xml b/indra/newview/skins/default/xui/en/menu_pie_object.xml
index 047fee9532..c384fe9953 100644
--- a/indra/newview/skins/default/xui/en/menu_pie_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_pie_object.xml
@@ -58,78 +58,15 @@
         <pie_slice.on_enable
             function="Object.EnableBuy" />
     </pie_slice>
-
-    <pie_menu
-        label="Take &gt;"
-        name="Take Submenu">
-        <pie_slice
-         enabled="false"
-         label="Take"
-         name="Take">
-            <pie_slice.on_click
-             function="Object.Take"/>
-            <pie_slice.on_enable
-             function="Object.VisibleTake"/>
-            <pie_slice.on_visible
-             function="Object.VisibleTakeSingle"/>
-        </pie_slice>
-        <pie_slice
-         enabled="false"
-         label="Take copy"
-         name="Take Copy">
-            <pie_slice.on_click
-             function="Tools.TakeCopy"/>
-            <pie_slice.on_enable
-             function="Tools.EnableTakeCopy"/>
-            <pie_slice.on_visible
-             function="Object.VisibleTakeSingle"/>
-        </pie_slice>
-        <pie_slice
-         enabled="false"
-         label="As combined item"
-         name="Take combined">
-            <pie_slice.on_click
-             function="Object.Take"/>
-            <pie_slice.on_enable
-             function="Object.VisibleTake"/>
-            <pie_slice.on_visible
-             function="Object.VisibleTakeMultiple"/>
-        </pie_slice>
-        <pie_slice
-         enabled="false"
-         label="Copy as combined item"
-         name="Take Copy combined">
-            <pie_slice.on_click
-             function="Tools.TakeCopy"/>
-            <pie_slice.on_enable
-             function="Tools.EnableTakeCopy"/>
-            <pie_slice.on_visible
-             function="Object.VisibleTakeMultiple"/>
-        </pie_slice>
-        <pie_slice
-         enabled="false"
-         label="As separate items"
-         name="Take Separate">
-            <pie_slice.on_click
-             function="Object.TakeSeparate"/>
-            <pie_slice.on_enable
-             function="Object.EnableTakeMultiple"/>
-            <pie_slice.on_visible
-             function="Object.VisibleTakeMultiple"/>
-        </pie_slice>
-        <pie_slice
-         enabled="false"
-         label="Copies as separate items"
-         name="Take Copy Separate">
-            <pie_slice.on_click
-             function="Object.TakeSeparateCopy"/>
-            <pie_slice.on_enable
-             function="Tools.EnableCopySeparate"/>
-            <pie_slice.on_visible
-             function="Object.VisibleTakeMultiple"/>
-        </pie_slice>
-    </pie_menu>
-
+    <pie_slice
+        autohide="true"
+        label="Take"
+        name="Pie Object Take">
+        <pie_slice.on_click
+            function="Object.Take"/>
+        <pie_slice.on_enable
+            function="Object.VisibleTake"/>
+    </pie_slice>
     <pie_slice
         enabled="false"
         label="Pay"
@@ -162,6 +99,15 @@
         <pie_slice.on_enable
             function="Object.EnableWear" />
     </pie_slice>
+    <pie_slice
+        enabled="false"
+        label="Take Copy"
+        name="Take Copy">
+        <pie_slice.on_click
+            function="Tools.TakeCopy" />
+        <pie_slice.on_enable
+            function="Tools.EnableTakeCopy" />
+    </pie_slice>
     <pie_menu
         label="Attach HUD &gt;"
         name="Pie Object Attach HUD" />
diff --git a/indra/newview/skins/default/xui/es/menu_pie_object.xml b/indra/newview/skins/default/xui/es/menu_pie_object.xml
index 6a869f014b..735648d129 100644
--- a/indra/newview/skins/default/xui/es/menu_pie_object.xml
+++ b/indra/newview/skins/default/xui/es/menu_pie_object.xml
@@ -6,14 +6,12 @@
 	<pie_slice label="Sentarme" name="Pie Object Sit"/>
 	<pie_slice label="Levantarme" name="Object Stand Up"/>
 	<pie_slice label="Comprar" name="Buy..."/>
-	<pie_menu label="Tomar &gt;" name="Take Submenu">
-		<pie_slice label="Tomar" name="Take" />
-		<pie_slice label="Tomar una copia" name="Take Copy" />
-	</pie_menu>
+	<pie_slice label="Tomar" name="Pie Object Take"/>
 	<pie_slice label="Pagar" name="Pay..."/>
 	<pie_menu label="Más &gt;" name="Object Pie More 1">
 		<pie_slice label="Eliminar" name="Delete"/>
 		<pie_slice label="Vestir" name="Wear"/>
+		<pie_slice label="Tomar una copia" name="Take Copy"/>
 		<pie_menu label="Anexar HUD &gt;" name="Pie Object Attach HUD"/>
 		<pie_menu label="Anexar &gt;" name="Pie Object Attach"/>
 		<pie_slice label="Devolver" name="Return..."/>
diff --git a/indra/newview/skins/default/xui/fr/menu_pie_object.xml b/indra/newview/skins/default/xui/fr/menu_pie_object.xml
index 7f2d74931e..3470749220 100644
--- a/indra/newview/skins/default/xui/fr/menu_pie_object.xml
+++ b/indra/newview/skins/default/xui/fr/menu_pie_object.xml
@@ -6,14 +6,12 @@
 	<pie_slice label="S'asseoir" name="Pie Object Sit"/>
 	<pie_slice label="Se lever" name="Object Stand Up"/>
 	<pie_slice label="Acheter" name="Buy..."/>
-	<pie_menu label="Prendre &gt;" name="Take Submenu">
-		<pie_slice label="Prendre" name="Take" />
-		<pie_slice label="Prendre une copie" name="Take Copy" />
-	</pie_menu>
+	<pie_slice label="Prendre" name="Pie Object Take"/>
 	<pie_slice label="Payer" name="Pay..."/>
 	<pie_menu label="Plus &gt;" name="Object Pie More 1">
 		<pie_slice label="Supprimer" name="Delete"/>
 		<pie_slice label="Porter" name="Wear"/>
+		<pie_slice label="Prendre une copie" name="Take Copy"/>
 		<pie_menu label="Attacher au HUD &gt;" name="Pie Object Attach HUD"/>
 		<pie_menu label="Attacher &gt;" name="Pie Object Attach">
 			<pie_menu label="Squelette (ext) &gt;" name="Enhanced Skeleton">
diff --git a/indra/newview/skins/default/xui/it/menu_pie_object.xml b/indra/newview/skins/default/xui/it/menu_pie_object.xml
index 67c0efa101..0e8f06ede0 100644
--- a/indra/newview/skins/default/xui/it/menu_pie_object.xml
+++ b/indra/newview/skins/default/xui/it/menu_pie_object.xml
@@ -6,18 +6,12 @@
 	<pie_slice label="Siediti qui" name="Pie Object Sit"/>
 	<pie_slice label="Alzati" name="Object Stand Up"/>
 	<pie_slice label="Compra" name="Buy..."/>
-	<pie_menu label="Prendi &gt;" name="Take Submenu">
-		<pie_slice label="Prendi" name="Take" />
-		<pie_slice label="Prendi copia" name="Take Copy" />
-		<pie_slice label="Come multi-oggetto" name="Take combined" />
-		<pie_slice label="Copia come multi-oggetto" name="Take Copy combined" />
-		<pie_slice label="Come oggetti separati" name="Take Separate" />
-		<pie_slice label="Copie come oggetti separati" name="Take Copy Separate" />
-	</pie_menu>
+	<pie_slice label="Prendi" name="Pie Object Take"/>
 	<pie_slice label="Paga" name="Pay..."/>
 	<pie_menu label="Altro &gt;" name="Object Pie More 1">
 		<pie_slice label="Elimina" name="Delete"/>
 		<pie_slice label="Indossa" name="Wear"/>
+		<pie_slice label="Prendi copia" name="Take Copy"/>
 		<pie_menu label="Attacca HUD &gt;" name="Pie Object Attach HUD"/>
 		<pie_menu label="Attacca &gt;" name="Pie Object Attach">
 			<pie_menu label="Schel. avanz. &gt;" name="Enhanced Skeleton">
diff --git a/indra/newview/skins/default/xui/ja/menu_pie_object.xml b/indra/newview/skins/default/xui/ja/menu_pie_object.xml
index ebdc8d9a07..f959fe19ac 100644
--- a/indra/newview/skins/default/xui/ja/menu_pie_object.xml
+++ b/indra/newview/skins/default/xui/ja/menu_pie_object.xml
@@ -19,13 +19,12 @@
     <pie_slice
         label="購入"
         name="Buy..."/>
-    <pie_menu label="取る &gt;" name="Take Submenu">
-        <pie_slice label="取る" name="Take" />
-        <pie_slice label="コピーを取る" name="Take Copy" />
-    </pie_menu>
+    <pie_slice
+        label="取る"
+        name="Pie Object Take"/>
     <pie_slice
         label="支払い" 
-        name="Pay..."/>
+		name="Pay..."/>
     <pie_menu
         label="詳細 &gt;"
         name="Object Pie More 1">
@@ -35,6 +34,9 @@
     <pie_slice
         label="装着"
         name="Wear"/>
+    <pie_slice
+        label="コピーを取る"
+        name="Take Copy"/>
     <pie_menu
         label="HUD装着先 &gt;"
         name="Pie Object Attach HUD" />
@@ -43,7 +45,7 @@
         name="Pie Object Attach" />
     <pie_slice
         label="返却" 
-        name="Return..."/>
+		name="Return..."/>
     <pie_menu
         label="詳細 &gt;"
         name="Object Pie More 2">
diff --git a/indra/newview/skins/default/xui/pl/menu_pie_object.xml b/indra/newview/skins/default/xui/pl/menu_pie_object.xml
index a6d38c6add..21c5f6a7d3 100644
--- a/indra/newview/skins/default/xui/pl/menu_pie_object.xml
+++ b/indra/newview/skins/default/xui/pl/menu_pie_object.xml
@@ -1,23 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <pie_menu name="Object Pie">
 	<pie_slice label="Otwórz" name="Open"/>
-	<pie_slice label="Edytuj" name="Build"/>
+	<pie_slice label="Stwórz" name="Build"/>
 	<pie_slice label="Dotknij" name="Pie Object Touch"/>
 	<pie_slice label="Usiądź tutaj" name="Pie Object Sit"/>
 	<pie_slice label="Wstań" name="Object Stand Up"/>
 	<pie_slice label="Kup" name="Buy..."/>
-	<pie_menu label="Weź &gt;" name="Take Submenu">
-		<pie_slice label="Weź" name="Take" />
-		<pie_slice label="Weź kopię" name="Take Copy" />
-		<pie_slice label="Jako: podniesione razem" name="Take combined" />
-		<pie_slice label="Kopię jako: podniesione razem" name="Take Copy combined" />
-		<pie_slice label="Jako: oddzielne obiekty" name="Take Separate" />
-		<pie_slice label="Kopie jako: oddzielne obiekty" name="Take Copy Separate" />
-	</pie_menu>
+	<pie_slice label="Weź" name="Pie Object Take"/>
 	<pie_slice label="Zapłać" name="Pay..."/>
 	<pie_menu label="Więcej &gt;" name="Object Pie More 1">
 		<pie_slice label="Usuń" name="Delete"/>
 		<pie_slice label="Załóż" name="Wear"/>
+		<pie_slice label="Weź kopię" name="Take Copy"/>
 		<pie_menu label="Dołącz HUD &gt;" name="Pie Object Attach HUD"/>
 		<pie_menu label="Dołącz &gt;" name="Pie Object Attach">
 			<pie_menu label="Roz. szkielet &gt;" name="Enhanced Skeleton">
diff --git a/indra/newview/skins/default/xui/ru/menu_pie_object.xml b/indra/newview/skins/default/xui/ru/menu_pie_object.xml
index 93a3945585..93238bda76 100644
--- a/indra/newview/skins/default/xui/ru/menu_pie_object.xml
+++ b/indra/newview/skins/default/xui/ru/menu_pie_object.xml
@@ -6,18 +6,12 @@
 	<pie_slice label="Сесть" name="Pie Object Sit"/>
 	<pie_slice label="Встать" name="Object Stand Up"/>
 	<pie_slice label="Купить" name="Buy..."/>
-	<pie_menu label="Взять &gt;" name="Take Submenu">
-		<pie_slice label="Взять" name="Take" />
-		<pie_slice label="Взять Копию" name="Take Copy" />
-		<pie_slice label="Как комбинированный предмет" name="Take combined" />
-		<pie_slice label="Копию как комбинированный предмет" name="Take Copy combined" />
-		<pie_slice label="Как отдельные предметы" name="Take Separate" />
-		<pie_slice label="Копии как отдельные предметы" name="Take Copy Separate" />
-	</pie_menu>
+	<pie_slice label="Взять" name="Pie Object Take"/>
 	<pie_slice label="Заплатить" name="Pay..."/>
 	<pie_menu label="Далее &gt;" name="Object Pie More 1">
 		<pie_slice label="Удалить" name="Delete"/>
 		<pie_slice label="Надеть" name="Wear"/>
+		<pie_slice label="Взять Копию" name="Take Copy"/>
 		<pie_menu label="Добавить HUD &gt;" name="Pie Object Attach HUD" />
 		<pie_menu label="Прикрепить &gt;" name="Pie Object Attach">
 			<pie_menu label="Доп.Скелет &gt;" name="Enhanced Skeleton">

From 705048ed5cb8a355c054f3aa72084e652f50c700 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Thu, 19 Sep 2024 11:46:59 +0100
Subject: [PATCH 09/14] FIRE-34518 attempt to trap access violation bugsplat in
 pushBatch

Can't tell from splats whether the mVertexBuffer is null or just invalid. we may need to look elsewhere to manage the vertexbuffer lifetime properly.
---
 indra/newview/lldrawpool.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/indra/newview/lldrawpool.cpp b/indra/newview/lldrawpool.cpp
index 739975eab4..4c92e1ae8d 100644
--- a/indra/newview/lldrawpool.cpp
+++ b/indra/newview/lldrawpool.cpp
@@ -630,10 +630,15 @@ void LLRenderPass::pushBatch(LLDrawInfo& params, bool texture, bool batch_textur
             }
         }
     }
-
+    // <FS:Beq> FIRE-34518 bugsplat access violation - place guard on unchecked mVertexBuffer access
+    if (params.mVertexBuffer == nullptr)
+    {
+        LL_WARNS() << "LLRenderPass::pushBatch: params.mVertexBuffer is nullptr. drawRange skipped." << LL_ENDL;
+        return;
+    }
+    // </FS:Beq>
     params.mVertexBuffer->setBuffer();
     params.mVertexBuffer->drawRange(LLRender::TRIANGLES, params.mStart, params.mEnd, params.mCount, params.mOffset);
-
     if (tex_setup)
     {
         gGL.matrixMode(LLRender::MM_TEXTURE0);

From 91ea8f79490aaa4e357c7255701a568c95323242 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Thu, 19 Sep 2024 14:17:43 +0100
Subject: [PATCH 10/14] Fix a Linux build breakage

---
 indra/newview/llappviewerlinux.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp
index d3f54fb72c..39af3f997c 100644
--- a/indra/newview/llappviewerlinux.cpp
+++ b/indra/newview/llappviewerlinux.cpp
@@ -171,7 +171,7 @@ static bool dumpCallback(const google_breakpad::MinidumpDescriptor& descriptor,
     return succeeded;
 }
 
-void setupBreadpad()
+void setupBreakpad()
 {
     std::string build_data_fname(gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "build_data.json"));
     gCrashLogger =  gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "linux-crash-logger.bin");
@@ -183,7 +183,7 @@ void setupBreadpad()
         return;
     }
 
-    boost::json::error_code ec;
+    boost::system::error_code ec;
     boost::json::value build_data = boost::json::parse(inf, ec);
     if(ec.failed())
     {
@@ -232,7 +232,7 @@ bool LLAppViewerLinux::init()
             gCrashBehavior = "ask";
         else
             gCrashBehavior = "send";
-        setupBreadpad();
+        setupBreakpad();
     }
 #endif
 

From 8f837e0c31aba63d757db2c7592b2b1b24231b96 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Thu, 19 Sep 2024 14:19:45 +0100
Subject: [PATCH 11/14] Avoid crash when widget is null

---
 indra/newview/llinventorylistitem.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/llinventorylistitem.cpp b/indra/newview/llinventorylistitem.cpp
index 452a195a3f..2c2432f0f8 100644
--- a/indra/newview/llinventorylistitem.cpp
+++ b/indra/newview/llinventorylistitem.cpp
@@ -144,6 +144,7 @@ void LLPanelInventoryListItemBase::addWidgetToRightSide(const std::string& name,
 
 void LLPanelInventoryListItemBase::addWidgetToRightSide(LLUICtrl* ctrl, bool show_widget/* = true*/)
 {
+    if (ctrl == nullptr)return; // <FS:Beq/> avoid crash if ctrl is null
     mRightSideWidgets.push_back(ctrl);
     setShowWidget(ctrl, show_widget);
 }

From e9907f0cbb2ce4d98bfb38a17280ac070efe9eeb Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Thu, 19 Sep 2024 16:11:48 +0200
Subject: [PATCH 12/14] Actually fix the outfit list correctly - looks like
 this isn't necessary anymore - at least the LL viewer doesn't allow removing
 body parts now apparently

---
 indra/newview/llinventorylistitem.cpp |  1 -
 indra/newview/llwearableitemslist.cpp | 12 +++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/indra/newview/llinventorylistitem.cpp b/indra/newview/llinventorylistitem.cpp
index 2c2432f0f8..452a195a3f 100644
--- a/indra/newview/llinventorylistitem.cpp
+++ b/indra/newview/llinventorylistitem.cpp
@@ -144,7 +144,6 @@ void LLPanelInventoryListItemBase::addWidgetToRightSide(const std::string& name,
 
 void LLPanelInventoryListItemBase::addWidgetToRightSide(LLUICtrl* ctrl, bool show_widget/* = true*/)
 {
-    if (ctrl == nullptr)return; // <FS:Beq/> avoid crash if ctrl is null
     mRightSideWidgets.push_back(ctrl);
     setShowWidget(ctrl, show_widget);
 }
diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp
index 9db4dc5f3f..0b6350d169 100644
--- a/indra/newview/llwearableitemslist.cpp
+++ b/indra/newview/llwearableitemslist.cpp
@@ -116,16 +116,10 @@ bool LLPanelWearableOutfitItem::postBuild()
 
     LLPanelWearableListItem::postBuild();
 
-    //if(mShowWidgets) // <FS:Ansariel> Make Add/Remove buttons work
+    if(mShowWidgets)
     {
-        // <FS:Ansariel> Make Add/Remove buttons work
-        //addWidgetToRightSide(mAddWearableBtn);
-        //addWidgetToRightSide(mAddWearableBtn);
-        LLViewerInventoryItem* inv_item = getItem();
-        mShowWidgets &= (inv_item->getType() != LLAssetType::AT_BODYPART);
-        addWidgetToRightSide(mAddWearableBtn, mShowWidgets);
-        addWidgetToRightSide(mAddWearableBtn, mShowWidgets);
-        // </FS:Ansariel>
+        addWidgetToRightSide(mAddWearableBtn);
+        addWidgetToRightSide(mRemoveWearableBtn);
 
         mAddWearableBtn->setClickedCallback(boost::bind(&LLPanelWearableOutfitItem::onAddWearable, this));
         mRemoveWearableBtn->setClickedCallback(boost::bind(&LLPanelWearableOutfitItem::onRemoveWearable, this));

From e82bfbeab428a8a13cf38dd790b9d114279ec6f9 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Thu, 19 Sep 2024 19:19:21 +0200
Subject: [PATCH 13/14] Ultimately sort out the add/remove buttons in
 appearance window

---
 indra/newview/llwearableitemslist.cpp         | 37 +++++--------------
 indra/newview/llwearableitemslist.h           |  5 ---
 .../xui/en/widgets/cof_wearable_list_item.xml |  2 +
 3 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp
index 0b6350d169..e534f3e651 100644
--- a/indra/newview/llwearableitemslist.cpp
+++ b/indra/newview/llwearableitemslist.cpp
@@ -186,7 +186,6 @@ LLPanelWearableOutfitItem::LLPanelWearableOutfitItem(LLViewerInventoryItem* item
 : LLPanelWearableListItem(item, params)
 , mWornIndicationEnabled(worn_indication_enabled)
 , mShowWidgets(show_widgets)
-, mIsWorn(false) // <FS:Ansariel> Make Add/Remove buttons work
 {
     if(mShowWidgets)
     {
@@ -211,8 +210,6 @@ void LLPanelWearableOutfitItem::updateItem(const std::string& name,
     // an inventory observer upon link in COF beind added or removed so actual
     // worn status of a linked item may still remain unchanged.
     bool is_worn = LLAppearanceMgr::instance().isLinkedInCOF(mInventoryItemUUID);
-    // <FS:Ansariel> Make Add/Remove buttons work
-    mIsWorn = is_worn;
     // <FS:Ansariel> Better attachment list
     //if (mWornIndicationEnabled && is_worn)
     //{
@@ -255,13 +252,10 @@ void LLPanelWearableOutfitItem::updateItem(const std::string& name,
     {
         setShowWidget(mAddWearableBtn, !is_worn);
 
-        // <FS:Ansariel> Make Add/Remove buttons work
-        //// Body parts can't be removed, only replaced
-        //LLViewerInventoryItem* inv_item = getItem();
-        //bool show_remove = is_worn && inv_item && (inv_item->getType() != LLAssetType::AT_BODYPART);
-        //setShowWidget("remove_wearable", show_remove);
-        setShowWidget(mRemoveWearableBtn, is_worn);
-        // </FS:Ansariel>
+        // Body parts can't be removed, only replaced
+        LLViewerInventoryItem* inv_item = getItem();
+        bool show_remove = is_worn && inv_item && (inv_item->getType() != LLAssetType::AT_BODYPART);
+        setShowWidget(mRemoveWearableBtn, show_remove);
 
         if(mHovered)
         {
@@ -549,7 +543,7 @@ FSPanelCOFWearableOutfitListItem::FSPanelCOFWearableOutfitListItem(LLViewerInven
                                                      bool show_widgets,
                                                      const FSPanelCOFWearableOutfitListItem::Params& params)
 : LLPanelWearableOutfitItem(item, worn_indication_enabled, params, show_widgets)
-, mWeightCtrl(NULL)
+, mWeightCtrl(nullptr)
 {
     LLTextBox::Params weight_params = params.item_weight;
     applyXUILayout(weight_params, this);
@@ -570,7 +564,8 @@ bool FSPanelCOFWearableOutfitListItem::postBuild()
     // Reserve space for 'delete' button event if it is invisible.
     setRightWidgetsWidth(mWeightCtrl->getRect().getWidth() + 5);
 
-    setWidgetsVisible(true);
+    mWeightCtrl->setVisible(true);
+
     reshapeWidgets();
 
     return true;
@@ -591,19 +586,7 @@ void FSPanelCOFWearableOutfitListItem::updateItemWeight(U32 item_weight)
 void FSPanelCOFWearableOutfitListItem::updateItem(const std::string& name, EItemState item_state)
 {
     LLPanelWearableOutfitItem::updateItem(name, item_state);
-
-    setShowWidget("add_wearable", false);
-    setShowWidget("remove_wearable", mShowWidgets && mIsWorn && mHovered);
-    setWidgetsVisible(true);
-    reshapeWidgets();
-}
-
-//virtual
-void FSPanelCOFWearableOutfitListItem::onMouseEnter(S32 x, S32 y, MASK mask)
-{
-    LLPanelInventoryListItemBase::onMouseEnter(x, y, mask);
-    setShowWidget("remove_wearable", mShowWidgets && mIsWorn);
-    setWidgetsVisible(true);
+    mWeightCtrl->setVisible(true);
     reshapeWidgets();
 }
 
@@ -611,8 +594,8 @@ void FSPanelCOFWearableOutfitListItem::onMouseEnter(S32 x, S32 y, MASK mask)
 void FSPanelCOFWearableOutfitListItem::onMouseLeave(S32 x, S32 y, MASK mask)
 {
     LLPanelInventoryListItemBase::onMouseLeave(x, y, mask);
-    setShowWidget("remove_wearable", false);
-    setWidgetsVisible(true);
+    setWidgetsVisible(false);
+    mWeightCtrl->setVisible(true); // setWidgetsVisible sets this invisible - make it visible again
     reshapeWidgets();
 }
 
diff --git a/indra/newview/llwearableitemslist.h b/indra/newview/llwearableitemslist.h
index f22f44b40d..36d9685500 100644
--- a/indra/newview/llwearableitemslist.h
+++ b/indra/newview/llwearableitemslist.h
@@ -107,11 +107,7 @@ private:
     LLButton* mAddWearableBtn = nullptr;
     LLButton* mRemoveWearableBtn = nullptr;
     bool    mWornIndicationEnabled;
-    // <FS:Ansariel> Make Add/Remove buttons work
-protected:
     bool mShowWidgets;
-    bool mIsWorn;
-    // </FS:Ansariel>
 };
 
 class LLPanelDeletableWearableListItem : public LLPanelWearableListItem
@@ -259,7 +255,6 @@ public:
 
     /*virtual*/ void updateItem(const std::string& name, EItemState item_state = IS_DEFAULT);
 
-    /*virtual*/ void onMouseEnter(S32 x, S32 y, MASK mask);
     /*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask);
 
 protected:
diff --git a/indra/newview/skins/default/xui/en/widgets/cof_wearable_list_item.xml b/indra/newview/skins/default/xui/en/widgets/cof_wearable_list_item.xml
index c8bcdced25..55c000b5b4 100644
--- a/indra/newview/skins/default/xui/en/widgets/cof_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/cof_wearable_list_item.xml
@@ -59,6 +59,7 @@
    width="70" />
     <add_btn
      name="add_wearable"
+     visible="false"
      layout="topleft"
      follows="top|right"
      image_unselected="Add_Icon"
@@ -70,6 +71,7 @@
      tab_stop="false" />
     <remove_btn
      name="remove_wearable"
+     visible="false"
      layout="topleft"
      follows="top|right"
      image_unselected="Remove_Icon"

From 403abcb574c121520290b648e4e1e794985d49f8 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Thu, 19 Sep 2024 21:28:16 +0200
Subject: [PATCH 14/14] FIRE-34513 French translation update

---
 .../default/xui/fr/floater_bulk_upload.xml    | 33 ++++++++++++++++
 .../xui/fr/floater_gltf_asset_editor.xml      | 24 ++++++++++++
 .../fr/floater_region_restart_schedule.xml    | 39 +++++++++++++++++++
 .../default/xui/fr/floater_settings_color.xml | 13 +++++++
 4 files changed, 109 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/fr/floater_bulk_upload.xml
 create mode 100644 indra/newview/skins/default/xui/fr/floater_gltf_asset_editor.xml
 create mode 100644 indra/newview/skins/default/xui/fr/floater_region_restart_schedule.xml
 create mode 100644 indra/newview/skins/default/xui/fr/floater_settings_color.xml

diff --git a/indra/newview/skins/default/xui/fr/floater_bulk_upload.xml b/indra/newview/skins/default/xui/fr/floater_bulk_upload.xml
new file mode 100644
index 0000000000..7010fc5963
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_bulk_upload.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="bulk_upload">
+	<layout_stack name="maint_layout">
+		<layout_panel name="count_panel">
+			<text name="number_of_items">
+				Éléments à envoyer : [COUNT]
+			</text>
+		</layout_panel>
+		<layout_panel name="warning_panel">
+			<text name="textures_2k_warning">
+				Par défaut, une ou plusieurs textures seront mises à l'échelle à 2048px.
+			</text>
+		</layout_panel>
+		<layout_panel name="checkbox_panel">
+			<check_box label="Mettre à l'échelle les textures jusqu'à un maximum de 1024px" name="upload_2k" />
+		</layout_panel>
+		<layout_panel name="cost_panel">
+			<text name="upload_cost">
+				Coût : [COST]L$
+			</text>
+		</layout_panel>
+		<layout_panel name="buttoms_panel">
+			<button label="Envoyer" name="upload_btn" />
+			<button label="Annuler" name="cancel_btn" />
+		</layout_panel>
+		<layout_panel name="link_panel">
+			<text name="new_folder_textbox">
+Comment les textures envoyées sont mises à l'échelle :
+https://wiki.secondlife.com/wiki/Limits#All_Viewers
+			</text>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_gltf_asset_editor.xml b/indra/newview/skins/default/xui/fr/floater_gltf_asset_editor.xml
new file mode 100644
index 0000000000..74b1d7e318
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_gltf_asset_editor.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="gltf asset editor">
+	<floater.string name="floater_title" value="Éditeur de scènes GLTF" />
+	<floater.string name="scene_tittle" value="Scène" />
+	<floater.string name="node_tittle" value="Nœud" />
+	<floater.string name="mesh_tittle" value="Mesh" />
+	<floater.string name="skin_tittle" value="Peau" />
+	<layout_stack name="main_layout">
+		<layout_panel name="transforms_panel">
+			<menu_button name="clipboard_pos_btn" tool_tip="Options de collage" />
+			<text name="label position" tool_tip="Position (mètres)">
+				Position (m)
+			</text>
+			<menu_button name="clipboard_size_btn" tool_tip="Options de collage" />
+			<text name="label size" tool_tip="Taille (mètres)">
+				Taille (m)
+			</text>
+			<menu_button name="clipboard_rot_btn" tool_tip="Options de collage" />
+			<text name="label rotation" tool_tip="Rotation (degrés)">
+				Rotation (°)
+			</text>
+		</layout_panel>
+	</layout_stack>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/fr/floater_region_restart_schedule.xml b/indra/newview/skins/default/xui/fr/floater_region_restart_schedule.xml
new file mode 100644
index 0000000000..8f1fe4dfea
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_region_restart_schedule.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_region_restart_schedule">
+	<text name="days_general">
+		Redémarrer la région ces jours-ci :
+	</text>
+	<check_box name="s_chk" tool_tip="Dimanche" />
+	<check_box name="m_chk" tool_tip="Lundi" />
+	<check_box name="t_chk" tool_tip="Mardi" />
+	<check_box name="w_chk" tool_tip="Mercredi" />
+	<check_box name="r_chk" tool_tip="Jeudi" />
+	<check_box name="f_chk" tool_tip="Vendredi" />
+	<check_box name="a_chk" tool_tip="Samedi" />
+	<text name="su_label">
+		Di
+	</text>
+	<text name="mo_label">
+		Lu
+	</text>
+	<text name="tu_label">
+		Ma
+	</text>
+	<text name="we_label">
+		Me
+	</text>
+	<text name="th_label">
+		Je
+	</text>
+	<text name="fr_label">
+		Ve
+	</text>
+	<text name="sa_label">
+		Sa
+	</text>
+	<text name="at_label">
+		à
+	</text>
+	<button name="save_btn" label="Enregistrer" />
+	<button name="cancel_btn" label="Annuler" />
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_settings_color.xml b/indra/newview/skins/default/xui/fr/floater_settings_color.xml
new file mode 100644
index 0000000000..e8ad5e3875
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_settings_color.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="settings_color" title="Paramètres de couleur">
+	<filter_editor label="Texte à chercher" name="filter_input" />
+	<scroll_list name="setting_list">
+		<scroll_list.columns label="Couleur" name="color" />
+	</scroll_list>
+	<text name="color_name_txt">
+		Nom de la couleur
+	</text>
+	<spinner label="Alpha" name="alpha_spinner" />
+	<button label="Rétablir les valeurs par défaut" name="default_btn" />
+	<check_box label="Afficher uniquement les modifications" name="hide_default" />
+</floater>