From 409befbd6920b3dbf13e34af0181c347f403783f Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Thu, 4 Aug 2022 14:58:57 +0200
Subject: [PATCH 01/19] Fix "Mimimimimi... I'm a whiny pedantic GCC compiler...
 Mimimimi" issue...

---
 indra/newview/llpanelface.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 890b546fe0..c29751ce44 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -3651,7 +3651,7 @@ void LLPanelFace::LLSelectedTE::getFace(LLFace*& face_to_return, bool& identical
 
 void LLPanelFace::LLSelectedTE::getImageFormat(LLGLenum& image_format_to_return, bool& identical_face)
 {
-	LLGLenum image_format;
+	LLGLenum image_format{ GL_RGB };
 	struct LLSelectedTEGetImageFormat : public LLSelectedTEGetFunctor<LLGLenum>
 	{
 		LLGLenum get(LLViewerObject* object, S32 te_index)

From 0f9ffbe1f35fbfa685a91e085084ebd633f20a20 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Thu, 4 Aug 2022 17:24:52 +0200
Subject: [PATCH 02/19] Updated Polish translation (copypaste)

---
 .../default/xui/en/panel_tools_texture.xml    |  2 +-
 .../skins/default/xui/pl/floater_tools.xml    | 22 ++++++++++---------
 .../default/xui/pl/menu_attachment_self.xml   |  1 +
 .../default/xui/pl/menu_copy_paste_color.xml  |  5 +++++
 .../xui/pl/menu_copy_paste_features.xml       |  5 +++++
 .../default/xui/pl/menu_copy_paste_light.xml  |  5 +++++
 .../default/xui/pl/menu_copy_paste_object.xml |  5 +++++
 .../default/xui/pl/menu_copy_paste_pos.xml    |  7 ++++++
 .../default/xui/pl/menu_copy_paste_rot.xml    |  7 ++++++
 .../default/xui/pl/menu_copy_paste_size.xml   |  7 ++++++
 .../xui/pl/menu_copy_paste_texture.xml        |  5 +++++
 .../skins/default/xui/pl/menu_inventory.xml   |  2 ++
 .../xui/pl/menu_pie_attachment_self.xml       |  1 +
 .../skins/default/xui/pl/notifications.xml    | 16 ++++++++++++++
 .../default/xui/pl/panel_tools_texture.xml    | 16 ++++++++++++--
 15 files changed, 93 insertions(+), 13 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/pl/menu_copy_paste_color.xml
 create mode 100644 indra/newview/skins/default/xui/pl/menu_copy_paste_features.xml
 create mode 100644 indra/newview/skins/default/xui/pl/menu_copy_paste_light.xml
 create mode 100644 indra/newview/skins/default/xui/pl/menu_copy_paste_object.xml
 create mode 100644 indra/newview/skins/default/xui/pl/menu_copy_paste_pos.xml
 create mode 100644 indra/newview/skins/default/xui/pl/menu_copy_paste_rot.xml
 create mode 100644 indra/newview/skins/default/xui/pl/menu_copy_paste_size.xml
 create mode 100644 indra/newview/skins/default/xui/pl/menu_copy_paste_texture.xml

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 9a58fd4a26..9214c1f141 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -21,7 +21,7 @@
             </panel.string>
             <panel.string
              name="paste_error_inventory_not_found">
-              One or more texture not found in inventory.
+              One or more textures not found in inventory.
             </panel.string>
             <panel.string
              name="paste_options">
diff --git a/indra/newview/skins/default/xui/pl/floater_tools.xml b/indra/newview/skins/default/xui/pl/floater_tools.xml
index d1cd6eadc9..accc98e2e4 100644
--- a/indra/newview/skins/default/xui/pl/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pl/floater_tools.xml
@@ -135,8 +135,8 @@
 	<text name="selection_empty">
 		Zaznacz coś!
 	</text>
-	<text name="remaining_capacity">
-		[CAPACITY_STRING] [secondlife:///app/openfloater/object_weights Więcej]
+	<text name="more info label">
+		[secondlife:///app/openfloater/object_weights Więcej]
 	</text>
 	<tab_container name="Object Info Tabs">
 		<panel label="Ogólne" name="General">
@@ -255,15 +255,15 @@
 		</panel>
 		<panel label="Obiekt" name="Object">
 			<panel.string name="paste_position">
-				Wklej pozycję
+Wklej pozycję
 [VALUE]
 			</panel.string>
 			<panel.string name="paste_size">
-				Wklej rozmiar
+Wklej rozmiar
 [VALUE]
 			</panel.string>
 			<panel.string name="paste_rotation">
-				Wklej obrót
+Wklej obrót
 [VALUE]
 			</panel.string>
 			<check_box label="Zablokowany" name="checkbox locked" tool_tip="Chroni obiekt przed przesunięciem lub usunięciem. Bardzo pomocne w czasie budowania, aby uniknąć niezamierzonych edycji."/>
@@ -275,21 +275,21 @@
 			</text>
 			<button name="copy_pos_btn" label="K" tool_tip="Kopiuj pozycję"/>
 			<button name="paste_pos_btn" label="W" tool_tip="Wklej pozycję"/>
-			<button name="paste_pos_clip_btn" label="w" tool_tip="Wklej pozycję ze schowka"/>
+			<button name="paste_pos_clip_btn" label="w" tool_tip="Spróbuj wkleić pozycję ze schowka"/>
 			<text name="label size">
 				Rozmiar (metry)
 			</text>
 			<button name="copy_size_btn" label="K" tool_tip="Kopiuj rozmiar"/>
 			<button name="paste_size_btn" label="W" tool_tip="Wklej rozmiar"/>
-			<button name="paste_size_clip_btn" label="w" tool_tip="Wklej rozmiar ze schowka"/>
+			<button name="paste_size_clip_btn" label="w" tool_tip="Spróbuj wkleić rozmiar ze schowka"/>
 			<text name="label rotation">
 				Obrót (stopnie)
 			</text>
 			<button name="copy_rot_btn" label="K" tool_tip="Kopiuj obrót"/>
 			<button name="paste_rot_btn" label="W" tool_tip="Wklej obrót"/>
-			<button name="paste_rot_clip_btn" label="w" tool_tip="Wklej obrót ze schowka"/>
-			<button label="Kopiuj" name="copy_params_btn" tool_tip="Kopiuj parametry do schowka"/>
-			<button label="Wklej" name="paste_params_btn" tool_tip="Wklej parametry ze schowka"/>
+			<button name="paste_rot_clip_btn" label="w" tool_tip="Spróbuj wkleić obrót ze schowka"/>
+			<button label="Kopiuj" name="copy_params_btn" tool_tip="Kopiuj parametry obiektu do schowka"/>
+			<button label="Wklej" name="paste_params_btn" tool_tip="Wklej parametry obiektu ze schowka"/>
 			<combo_box name="comboBaseType">
 				<combo_box.item label="Klocek" name="Box"/>
 				<combo_box.item label="Walec" name="Cylinder"/>
@@ -431,6 +431,8 @@ Nis ↔ Najniż
 			</text>
 			<check_box label="Animowany mesz" name="Animated Mesh Checkbox Ctrl" tool_tip="Umożliwia niezależne animowanie obiektów riggowanych" />
 			<check_box label="Elastyczność" name="Flexible1D Checkbox Ctrl" tool_tip="Elastyczność wzdłuż osi Z (tylko po stronie klienta)"/>
+			<button name="copy_features_btn" tool_tip="Skopiuj parametry cech do schowka" />
+			<button name="paste_features_btn" tool_tip="Wklej parametry cech ze schowka" />
 			<spinner label="Gładkość" name="FlexNumSections"/>
 			<spinner label="Ciężar" name="FlexGravity"/>
 			<spinner label="Tarcie" name="FlexFriction"/>
diff --git a/indra/newview/skins/default/xui/pl/menu_attachment_self.xml b/indra/newview/skins/default/xui/pl/menu_attachment_self.xml
index 0913ed0e1b..8cdc550655 100644
--- a/indra/newview/skins/default/xui/pl/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/pl/menu_attachment_self.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Attachment Pie">
 	<menu_item_call label="Dotknij" name="Attachment Object Touch"/>
+	<menu_item_call label="Pokaż w Szafie" name="Show original"/>
 	<menu_item_call label="Edytuj" name="Edit..."/>
 	<menu_item_call label="Odłącz" name="Detach"/>
 	<context_menu label="Zapisz jako" name="Export Menu">
diff --git a/indra/newview/skins/default/xui/pl/menu_copy_paste_color.xml b/indra/newview/skins/default/xui/pl/menu_copy_paste_color.xml
new file mode 100644
index 0000000000..cb7da5678d
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_copy_paste_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Copy Paste Color Menu">
+	<menu_item_call label="Kopiuj" name="params_copy" />
+	<menu_item_call label="Wklej" name="params_paste" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_copy_paste_features.xml b/indra/newview/skins/default/xui/pl/menu_copy_paste_features.xml
new file mode 100644
index 0000000000..d578f14a87
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_copy_paste_features.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Copy Paste Features Menu">
+	<menu_item_call label="Kopiuj" name="params_copy" />
+	<menu_item_call label="Wklej" name="params_paste" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_copy_paste_light.xml b/indra/newview/skins/default/xui/pl/menu_copy_paste_light.xml
new file mode 100644
index 0000000000..7a94f0dbe9
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_copy_paste_light.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Copy Paste Light Menu">
+	<menu_item_call label="Kopiuj" name="params_copy" />
+	<menu_item_call label="Wklej" name="params_paste" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_copy_paste_object.xml b/indra/newview/skins/default/xui/pl/menu_copy_paste_object.xml
new file mode 100644
index 0000000000..9d366c1e59
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_copy_paste_object.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Copy Paste Object Menu">
+	<menu_item_call label="Kopiuj" name="params_copy" />
+	<menu_item_call label="Wklej" name="params_paste" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_copy_paste_pos.xml b/indra/newview/skins/default/xui/pl/menu_copy_paste_pos.xml
new file mode 100644
index 0000000000..3665c38f62
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_copy_paste_pos.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Copy Paste Position Menu">
+	<menu_item_call label="Kopiuj wszystko" name="psr_copy" />
+	<menu_item_call label="Kopiuj pozycję" name="pos_copy" />
+	<menu_item_call label="Wklej wszystko" name="psr_paste" />
+	<menu_item_call label="Wklej pozycję" name="pos_paste" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_copy_paste_rot.xml b/indra/newview/skins/default/xui/pl/menu_copy_paste_rot.xml
new file mode 100644
index 0000000000..cee65d7db5
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_copy_paste_rot.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Copy Paste Rotation Menu">
+	<menu_item_call label="Kopiuj wszystko" name="psr_copy" />
+	<menu_item_call label="Wklej obrót" name="rot_copy" />
+	<menu_item_call label="Wklej wszystko" name="psr_paste" />
+	<menu_item_call label="Wklej obrót" name="rot_paste" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_copy_paste_size.xml b/indra/newview/skins/default/xui/pl/menu_copy_paste_size.xml
new file mode 100644
index 0000000000..605eb69a72
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_copy_paste_size.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Copy Paste Size Menu">
+	<menu_item_call label="Kopiuj wszystko" name="psr_copy" />
+	<menu_item_call label="Wklej rozmiar" name="size_copy" />
+	<menu_item_call label="Wklej wszystko" name="psr_paste" />
+	<menu_item_call label="Wklej rozmiar" name="size_paste" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_copy_paste_texture.xml b/indra/newview/skins/default/xui/pl/menu_copy_paste_texture.xml
new file mode 100644
index 0000000000..90444cdb0f
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_copy_paste_texture.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Copy Paste Texture Menu">
+	<menu_item_call label="Kopiuj" name="params_copy" />
+	<menu_item_call label="Wklej" name="params_paste" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_inventory.xml b/indra/newview/skins/default/xui/pl/menu_inventory.xml
index 3d225871cf..575ed402e2 100644
--- a/indra/newview/skins/default/xui/pl/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/pl/menu_inventory.xml
@@ -123,6 +123,8 @@
 	<menu_item_call label="Zdejmij" name="Take Off"/>
 	<menu_item_call name="Settings Apply Local" label="Stosuj tylko dla mnie" />
 	<menu_item_call name="Settings Apply Parcel" label="Stosuj dla działki" />
+	<menu_item_call label="Utwórz folder z wybranych" name="New folder from selected" />
+	<menu_item_call label="Rozgrupuj elementy folderu" name="Ungroup folder items" />
 	<menu_item_call label="Kopiuj do rzeczy Marketplace" name="Marketplace Copy"/>
 	<menu_item_call label="Przenieś do rzeczy Marketplace" name="Marketplace Move"/>
 	<menu_item_call label="--brak opcji--" name="--no options--"/>
diff --git a/indra/newview/skins/default/xui/pl/menu_pie_attachment_self.xml b/indra/newview/skins/default/xui/pl/menu_pie_attachment_self.xml
index 4db2244dfb..d7662d0d5b 100644
--- a/indra/newview/skins/default/xui/pl/menu_pie_attachment_self.xml
+++ b/indra/newview/skins/default/xui/pl/menu_pie_attachment_self.xml
@@ -14,6 +14,7 @@
             <pie_slice label="Kopia zapasowa" name="Backup"/>
             <pie_slice label="Collada" name="Collada"/>
         </pie_menu>
+        <pie_slice label="Pokaż w Szafie" name="Show original" />
         <pie_slice label="Inspekcja" name="Avatar Inspect" />
         <pie_slice label="Pokaż tekstury" name="Debug..."/>
     </pie_menu>
diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml
index 3c0724e877..ad2b1fc8a6 100644
--- a/indra/newview/skins/default/xui/pl/notifications.xml
+++ b/indra/newview/skins/default/xui/pl/notifications.xml
@@ -3633,6 +3633,13 @@ Wstępnie przetworzone tekstury [RESOLUTION] zostały lokalnie zaktualizowane dl
 		Nie można wyświetlić podglądu tej tekstury - jest niekopiowalna lub/oraz nietransferowalna.
 		<usetemplate ignoretext="Ostrzegaj, gdy podgląd na żywo nie może wyświetlić niekopiowalnych/nietransferowalnych tekstur" name="okignore" />
 	</notification>
+	<notification name="FacePasteFailed">
+		Wklejanie nie powiodło się. [REASON]
+	</notification>
+	<notification name="FacePasteTexturePermissions">
+		Zastosowano teksturę z ograniczonymi uprawnieniami, obiekt odziedziczy więc te uprawnienia.
+		<usetemplate ignoretext="Wklejanie: zastosowano teksturę z ograniczonymi uprawnieniami" name="notifyignore" />
+	</notification>
 	<notification name="ConfirmLeaveCall">
 		Czy jesteś pewien/pewna, że chcesz zakończyć rozmowę?
 		<usetemplate ignoretext="Potwierdź zanim rozmowa głosowa zostanie zakończona" name="okcancelignore" notext="Nie" yestext="Tak"/>
@@ -5165,6 +5172,15 @@ Rozpakowywanie: [UNPACK_TIME]s [USIZE]KB
 			<button name="cancel" text="Anuluj" />
 		</form>
 	</notification>
+	<notification label="Utwórz podfolder" name="CreateSubfolder">
+		Nazwij nowy folder:
+		<form name="form">
+			<button name="Cancel" text="Anuluj" />
+		</form>
+	</notification>
+	<notification name="SameFolderRequired">
+		Wybrane elementy muszą znajdować się w tym samym folderze.
+	</notification>
 	<notification name="NoValidEnvSettingFound">
 		Nie wybrano prawidłowego ustawienia otoczenia.
 
diff --git a/indra/newview/skins/default/xui/pl/panel_tools_texture.xml b/indra/newview/skins/default/xui/pl/panel_tools_texture.xml
index a25a9420c1..34973e2bb7 100644
--- a/indra/newview/skins/default/xui/pl/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/pl/panel_tools_texture.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Tekstura" name="Texture">
+	<panel.string name="paste_error_face_selection_mismatch">
+		Gdy kopiowanych jest wiele stron, to obiekt docelowy musi mieć wybraną taką samą ich liczbę.
+	</panel.string>
+	<panel.string name="paste_error_object_face_count_mismatch">
+		Gdy kopiowane są wszystkie strony, to obiekt docelowy musi mieć taką samą ich liczbę.
+	</panel.string>
+	<panel.string name="paste_error_inventory_not_found">
+		Nie znaleziono jednej lub więcej tekstur.
+	</panel.string>
+	<panel.string name="paste_options">
+		Skopiuj parametry tekstury do schowka
+	</panel.string>
 	<text name="color label">
 		Kolor
 	</text>
@@ -11,8 +23,8 @@
 		Blask
 	</text>
 	<check_box label="Pełna jasność" name="checkbox fullbright" />
-	<button tool_tip="Kopia" name="copy_face_btn" />
-	<button tool_tip="Wklej" name="paste_face_btn" />
+	<button name="copy_face_btn" tool_tip="Skopiuj parametry tekstury do schowka" />
+	<button name="paste_face_btn" tool_tip="Wklej parametry tekstury ze schowka" />
 	<combo_box name="combobox matmedia">
 		<combo_box.item label="Materiały" name="Materials" />
 		<combo_box.item label="Media" name="Media" />

From 0b0c697d4e3524dcc9778cc806b90acf590db886 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Thu, 4 Aug 2022 18:55:51 +0200
Subject: [PATCH 03/19] Fix flip texture scale buttons magically jumping when
 switching texture mode

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

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 9214c1f141..ebcdda3d70 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -21,7 +21,7 @@
             </panel.string>
             <panel.string
              name="paste_error_inventory_not_found">
-              One or more textures not found in inventory.
+              One or more texture not found in inventory.
             </panel.string>
             <panel.string
              name="paste_options">
@@ -579,7 +579,7 @@
              left="10"
              name="tex gen"
              text_readonly_color="LabelDisabledColor"
-             top_pad="49"
+             top="205"
              width="140">
                 Mapping
             </text>
@@ -615,7 +615,7 @@
              width="265" />
             <button
              follows="top|left"
-             height="20"
+             height="18"
              layout="topleft"
              left_pad="0"
              image_overlay="Edit_Flip_X"
@@ -645,7 +645,7 @@
              width="265" />
             <button
              follows="top|left"
-             height="20"
+             height="18"
              layout="topleft"
              left_pad="0"
              image_overlay="Edit_Flip_X"

From 30545a1cb479dabaafb80c484e83233112b5c1e7 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Thu, 4 Aug 2022 19:11:28 +0200
Subject: [PATCH 04/19] How did this happen???

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

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index ebcdda3d70..843536bbf3 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -21,7 +21,7 @@
             </panel.string>
             <panel.string
              name="paste_error_inventory_not_found">
-              One or more texture not found in inventory.
+              One or more textures not found in inventory.
             </panel.string>
             <panel.string
              name="paste_options">
@@ -579,7 +579,7 @@
              left="10"
              name="tex gen"
              text_readonly_color="LabelDisabledColor"
-             top="205"
+             top_pad="49"
              width="140">
                 Mapping
             </text>

From 21587fe4f60991183d09468a6f709eb396da32b7 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Thu, 4 Aug 2022 22:36:33 +0200
Subject: [PATCH 05/19] Fix a few cases where the avatar username wasn't used
 to create a mute in the mutelist

---
 indra/newview/fspanelblocklist.cpp  | 2 +-
 indra/newview/fsparticipantlist.cpp | 8 +++++---
 indra/newview/llinspectavatar.cpp   | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/indra/newview/fspanelblocklist.cpp b/indra/newview/fspanelblocklist.cpp
index adc1c8cc73..cb45a75384 100644
--- a/indra/newview/fspanelblocklist.cpp
+++ b/indra/newview/fspanelblocklist.cpp
@@ -440,7 +440,7 @@ void FSPanelBlockList::showProfile()
 void FSPanelBlockList::callbackBlockPicked(const uuid_vec_t& ids, const std::vector<LLAvatarName> names)
 {
 	if (names.empty() || ids.empty()) return;
-	LLMute mute(ids[0], names[0].getLegacyName(), LLMute::AGENT);
+	LLMute mute(ids[0], names[0].getUserName(), LLMute::AGENT);
 	LLMuteList::getInstance()->add(mute);
 	showPanelAndSelect(mute.mID);
 }
diff --git a/indra/newview/fsparticipantlist.cpp b/indra/newview/fsparticipantlist.cpp
index e292d67a11..b14275e446 100644
--- a/indra/newview/fsparticipantlist.cpp
+++ b/indra/newview/fsparticipantlist.cpp
@@ -803,10 +803,12 @@ void FSParticipantList::FSParticipantListMenu::toggleMute(const LLSD& userdata,
 		LL_WARNS("Speakers") << "Speaker " << speaker_id << " not found" << LL_ENDL;
 		return;
 	}
-	LLAvatarListItem* item = dynamic_cast<LLAvatarListItem*>(mParent.mAvatarList->getItemByValue(speaker_id));
-	if (NULL == item) return;
 
-	name = item->getAvatarName();
+	// We should have the name in the cache from the LLAvatarList this is used in combination with
+	LLAvatarName avname;
+	if (!LLAvatarNameCache::get(speaker_id, &avname)) return;
+
+	name = avname.getUserName();
 
 	LLMute::EType mute_type;
 	switch (speakerp->mType)
diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp
index 6401d8586e..6e14862044 100644
--- a/indra/newview/llinspectavatar.cpp
+++ b/indra/newview/llinspectavatar.cpp
@@ -737,7 +737,7 @@ void LLInspectAvatar::onClickShare()
 
 void LLInspectAvatar::onToggleMute()
 {
-	LLMute mute(mAvatarID, mAvatarName.getDisplayName(), LLMute::AGENT);
+	LLMute mute(mAvatarID, mAvatarName.getUserName(), LLMute::AGENT);
 
 	if (LLMuteList::getInstance()->isMuted(mute.mID, mute.mName))
 	{

From aa9728c98d73047711f7537b72c193b7b70c3540 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Fri, 5 Aug 2022 16:28:09 +0200
Subject: [PATCH 06/19] Polish translation: Revert a few strings in build
 floater to industry standard, as no one really names them like that

---
 indra/newview/skins/default/xui/pl/panel_tools_texture.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/newview/skins/default/xui/pl/panel_tools_texture.xml b/indra/newview/skins/default/xui/pl/panel_tools_texture.xml
index 34973e2bb7..56a01e3b90 100644
--- a/indra/newview/skins/default/xui/pl/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/pl/panel_tools_texture.xml
@@ -30,9 +30,9 @@
 		<combo_box.item label="Media" name="Media" />
 	</combo_box>
 	<radio_group name="radio_material_type">
-		<radio_item label="Tekstura (rozproszenie)" name="Texture (diffuse)" />
-		<radio_item label="Powierzchnia (normalne)" name="Bumpiness (normal)" />
-		<radio_item label="Lśnienie (odbicie)" name="Shininess (specular)" />
+		<radio_item label="Tekstura (diffuse)" name="Texture (diffuse)" />
+		<radio_item label="Powierzchnia (normal)" name="Bumpiness (normal)" />
+		<radio_item label="Lśnienie (specular)" name="Shininess (specular)" />
 	</radio_group>
 	<texture_picker label="Tekstura" name="texture control" tool_tip="Kliknij, aby wybrać obraz" />
 	<text name="label alphamode">

From 637ddfa00943d3f7ae0ae484103217104fcee1d7 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Fri, 5 Aug 2022 23:38:57 +0200
Subject: [PATCH 07/19] FIRE-31551: Fix aggressive switching into mouselook
 when pressing M

---
 indra/newview/llviewerwindow.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 4c13dc7fb6..40ff5174a4 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -3296,8 +3296,9 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
     if (keyboard_focus
         && !gFocusMgr.getKeystrokesOnly())
     {
-        LLUICtrl* cur_focus = dynamic_cast<LLUICtrl*>(keyboard_focus);
-        if (cur_focus && cur_focus->acceptsTextInput())
+        // <FS:Ansariel> FIRE-31551: This causes aggressive switching into mouselook while any floater has focus
+        //LLUICtrl* cur_focus = dynamic_cast<LLUICtrl*>(keyboard_focus);
+        //if (cur_focus && cur_focus->acceptsTextInput())
         {
 #ifdef LL_WINDOWS
             // On windows Alt Gr key generates additional Ctrl event, as result handling situations

From 12c7f4200459dce40c54d94045ad275f6290d41e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 5 Aug 2022 19:44:09 +0300
Subject: [PATCH 08/19] SL-17908 No left and right events when both held down

Reverts part of SL-15746
---
 indra/newview/llagent.cpp         | 3 +++
 indra/newview/llviewermessage.cpp | 7 -------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index b95e9f0f1a..757af5540b 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -832,6 +832,9 @@ void LLAgent::moveYaw(F32 mag, bool reset_view)
     U32 mask = AGENT_CONTROL_YAW_POS | AGENT_CONTROL_YAW_NEG;
     if ((getControlFlags() & mask) == mask)
     {
+        // Rotation into both directions should cancel out
+        // But keep sending controls to simulator,
+        // it's needed for script based controls
         gAgentCamera.setYawKey(0);
     }
 
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 65bedf92bb..048bc10a1b 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -4250,13 +4250,6 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
 	// trigger a control event.
 	U32 control_flags = gAgent.getControlFlags();
 
-    // Rotation into both directions should cancel out
-    U32 mask = AGENT_CONTROL_YAW_POS | AGENT_CONTROL_YAW_NEG;
-    if ((control_flags & mask) == mask)
-    {
-        control_flags &= ~mask;
-    }
-
 	MASK	key_mask = gKeyboard->currentMask(TRUE);
 
 	if (key_mask & MASK_ALT || key_mask & MASK_CONTROL)

From 20c075e6c46da5f274a944c46dadc57e09836776 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Sat, 6 Aug 2022 13:05:35 +0200
Subject: [PATCH 09/19] FIRE-31900 French translation update (copypaste), by
 Laurent Bechir

---
 .../default/xui/fr/floater_model_preview.xml  |  8 +--
 .../skins/default/xui/fr/floater_tools.xml    | 61 ++++++++++++++++++-
 .../default/xui/fr/menu_attachment_self.xml   |  1 +
 .../default/xui/fr/menu_copy_paste_color.xml  |  5 ++
 .../xui/fr/menu_copy_paste_features.xml       |  5 ++
 .../default/xui/fr/menu_copy_paste_light.xml  |  5 ++
 .../default/xui/fr/menu_copy_paste_object.xml |  5 ++
 .../default/xui/fr/menu_copy_paste_pos.xml    |  7 +++
 .../default/xui/fr/menu_copy_paste_rot.xml    |  7 +++
 .../default/xui/fr/menu_copy_paste_size.xml   |  7 +++
 .../xui/fr/menu_copy_paste_texture.xml        |  5 ++
 .../skins/default/xui/fr/menu_inventory.xml   |  2 +
 .../xui/fr/menu_pie_attachment_self.xml       |  7 +++
 .../skins/default/xui/fr/notifications.xml    |  9 +++
 .../default/xui/fr/panel_tools_texture.xml    |  8 ++-
 .../newview/skins/default/xui/fr/strings.xml  |  2 +-
 16 files changed, 136 insertions(+), 8 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/fr/menu_copy_paste_color.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_copy_paste_features.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_copy_paste_light.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_copy_paste_object.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_copy_paste_pos.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_copy_paste_rot.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_copy_paste_size.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_copy_paste_texture.xml

diff --git a/indra/newview/skins/default/xui/fr/floater_model_preview.xml b/indra/newview/skins/default/xui/fr/floater_model_preview.xml
index 306250572f..61c3deffb8 100644
--- a/indra/newview/skins/default/xui/fr/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_model_preview.xml
@@ -80,7 +80,7 @@
 				<item name="MeshOpt Auto" label="Générer Auto" />
 				<item name="MeshOptCombine" label="Générer précis" />
 				<item name="MeshOptSloppy" label="Générer imprécis" />
-				<item name="Generate" label="Générer fiable"/>
+				<item name="Generate" label="Générer crédible"/>
 			</combo_box>
 			<button label="Parcourir..." name="lod_browse_high"/>
 			<combo_box name="lod_mode_high">
@@ -95,7 +95,7 @@
 				<item name="MeshOpt Auto" label="Générer Auto" />
 				<item name="MeshOptCombine" label="Générer précis" />
 				<item name="MeshOptSloppy" label="Générer imprécis" />
-				<item name="Generate" label="Générer fiable"/>
+				<item name="Generate" label="Générer crédible"/>
 				<item label="Niveau de détail du dessus" name="Use LoD above" value="Niveau de détail du dessus"/>
 			</combo_box>
 			<button label="Parcourir..." name="lod_browse_medium"/>
@@ -111,7 +111,7 @@
 				<item name="MeshOpt Auto" label="Générer Auto" />
 				<item name="MeshOptCombine" label="Générer précis" />
 				<item name="MeshOptSloppy" label="Générer imprécis" />
-				<item name="Generate" label="Générer fiable"/>
+				<item name="Generate" label="Générer crédible"/>
 				<item label="Niveau de détail du dessus" name="Use LoD above" value="Niveau de détail du dessus"/>
 			</combo_box>
 			<button label="Parcourir..." name="lod_browse_low"/>
@@ -127,7 +127,7 @@
 				<item name="MeshOpt Auto" label="Générer Auto" />
 				<item name="MeshOptCombine" label="Générer précis" />
 				<item name="MeshOptSloppy" label="Générer imprécis" />
-				<item name="Generate" label="Générer fiable"/>
+				<item name="Generate" label="Générer crédible"/>
 				<item label="Niveau de détail du dessus" name="Use LoD above" value="Niveau de détail du dessus"/>
 			</combo_box>
 			<button label="Parcourir..." name="lod_browse_lowest"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml
index 7e7f765e59..3325ed9e54 100644
--- a/indra/newview/skins/default/xui/fr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tools.xml
@@ -126,7 +126,7 @@
 		Aucune sélection effectuée.
 	</text>
 	<text name="remaining_capacity">
-		[CAPACITY_STRING] [secondlife:///app/openfloater/object_weights Plus d&apos;infos]
+		[secondlife:///app/openfloater/object_weights Plus d&apos;infos]
 	</text>
 	<tab_container name="Object Info Tabs">
 		<panel label="Général" name="General">
@@ -259,6 +259,18 @@
 			</panel>
 		</panel>
 		<panel label="Objet" name="Object">
+			<panel.string name="paste_position">
+Coller position
+[VALUE]
+			</panel.string>
+			<panel.string name="paste_size">
+Coller taille
+[VALUE]
+			</panel.string>
+			<panel.string name="paste_rotation">
+Coller rotation
+[VALUE]
+			</panel.string>
 			<check_box label="Verrouillé" name="checkbox locked" tool_tip="Empêche l&apos;objet d&apos;être déplacé ou supprimé. Utile pendant la construction pour éviter les modifications involontaires."/>
 			<check_box label="Physique" name="Physical Checkbox Ctrl" tool_tip="Permet à l&apos;objet d&apos;être poussé et affecté par la gravité"/>
 			<check_box label="Temporaire" name="Temporary Checkbox Ctrl" tool_tip="Les objets sont supprimés une minute après leur création"/>
@@ -269,18 +281,29 @@
 			<spinner label="X" name="Pos X"/>
 			<spinner label="Y" name="Pos Y"/>
 			<spinner label="Z" name="Pos Z"/>
+			<button label="C" name="copy_pos_btn" tool_tip="Copie la position"/>
+			<button label="P" name="paste_pos_btn" tool_tip="Colle la position"/>
+			<button label="p" name="paste_pos_clip_btn" tool_tip="Essaie de coller la position depuis le presse-papiers"/>
 			<text name="label size">
 				Taille (mètres)
 			</text>
 			<spinner label="X" name="Scale X"/>
 			<spinner label="Y" name="Scale Y"/>
 			<spinner label="Z" name="Scale Z"/>
+			<button label="C" name="copy_size_btn" tool_tip="Copie la taille"/>
+			<button label="P" tool_tip="Colle la taille"/>
+			<button label="p" name="paste_size_clip_btn" tool_tip="Essaie de coller la taille depuis le presse-papiers"/>
 			<text name="label rotation">
 				Rotation (degrés)
 			</text>
 			<spinner label="X" name="Rot X"/>
 			<spinner label="Y" name="Rot Y"/>
 			<spinner label="Z" name="Rot Z"/>
+			<button label="C" name="copy_rot_btn" tool_tip="Copie la rotation"/>
+			<button label="P" name="paste_rot_btn" tool_tip="Colle la rotation"/>
+			<button label="p" name="paste_rot_clip_btn" tool_tip="Essaie de coller la rotation depuis le presse-papiers"/>
+			<button name="copy_params_btn" tool_tip="Copie les paramètres de l'objet dans le presse-papiers"/>
+			<button name="paste_params_btn" tool_tip="Colle les paramètres de l'objet à partir du presse-papiers"/>
 			<combo_box name="comboBaseType">
 				<combo_box.item label="Boîte" name="Box"/>
 				<combo_box.item label="Cylindre" name="Cylinder"/>
@@ -368,6 +391,40 @@
 				<combo_box.item label="Plan" name="Plane"/>
 				<combo_box.item label="Cylindre" name="Cylinder"/>
 			</combo_box>
+			<text name="mesh_info_label" >
+				Informations sur le maillage :
+			</text>
+			<text name="lod_num_tris" value="Nbre triangles"/>
+			<text name="mesh_lod_label">
+Haut:
+Moyen:
+Bas:
+Le plus bas:
+			</text>
+			<combo_box name="LOD_show_combo">
+				<combo_box.item label="Par défaut" name="Default"/>
+				<combo_box.item label="Haut" name="High"/>
+				<combo_box.item label="Moyen" name="Medium"/>
+				<combo_box.item label="Bas" name="Low"/>
+				<combo_box.item label="Le plus bas" name="Lowest/Imposter"/>
+			</combo_box>
+			<text name="ObjectLODbehaviourLabel" value="Comportement LOD de l'objet :"/>
+			<text name="object_radius" value="Rayon de l'objet :"/>
+			<text name="LOD_swap_factors_label" value="Facteurs LOD"/>
+			<text name="LOD_swap_defaults_label" value="Par défaut" tool_tip="Le paramètre par défaut du facteur LOD qui sera appliqué par la plupart des visualiseurs.."/>
+			<text name="LOD_swap_usr_label" tool_tip="Vos paramètres, tiré de RenderVolumeLODFactor" value="Les votres"/>
+			<text name="LOD_swap_label" value="Changement de LOD"/>
+			<string name="ll_lod_tooltip_msg">Paramètres par défaut du visualiseur de Linden Lab Second Life ([FACTOR])</string>
+			<string name="fs_lod_tooltip_msg">Paramètres par défaut de [APP_NAME] ([FACTOR])</string>
+			<text name="LOD_swap_usr_current" tool_tip="Votre facteur de LOD actuel" value="[FACTOR]"/>
+			<text name="LOD_swap_LOD_Change_label">
+Haut ↔ Moy.
+Moy. ↔ Bas
+Bas ↔ Plus bas
+			</text>
+			<text name="LODSwapTableDscriptionsText" tool_tip="Bonne conduite : Les créateurs doivent assurer un bon comportement LOD pour les paramètres par défaut dans toutes les visualiseurs.">
+				Ce tableau indique les limites de changement de niveau de détail en mètres à partir de la caméra.
+			</text>
 		</panel>
 		<panel label="Attributs" name="Features">
 			<panel.string name="None">
@@ -387,6 +444,8 @@
 			</text>
 			<check_box label="Maillage animé" name="Animated Mesh Checkbox Ctrl" tool_tip="Permet aux objets maillés calés d&apos;être animés indépendamment"/>
 			<check_box label="Flexibilité" name="Flexible1D Checkbox Ctrl" tool_tip="Permet à l&apos;objet de se plier le long de l&apos;axe Z (côté client uniquement)"/>
+			<button name="copy_features_btn" tool_tip="Copier les paramètres de la fonction dans le presse-papiers"/>
+			<button name="paste_features_btn" tool_tip="Coller les paramètres de la fonction à partir du presse-papiers"/>
 			<spinner label="Souplesse" name="FlexNumSections"/>
 			<spinner label="Gravité" name="FlexGravity"/>
 			<spinner label="Élasticité" name="FlexFriction"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_attachment_self.xml b/indra/newview/skins/default/xui/fr/menu_attachment_self.xml
index 48479ef0d6..c4d2988b13 100644
--- a/indra/newview/skins/default/xui/fr/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/fr/menu_attachment_self.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Attachment Pie">
 	<menu_item_call label="Toucher" name="Attachment Object Touch"/>
+	<menu_item_call label="Voir dans l'inventaire'" name="Show original"/>
 	<menu_item_call label="Modifier" name="Edit..."/>
 	<menu_item_call label="Détacher" name="Detach"/>
 	<context_menu label="Enregistrer sous" name="Export Menu">
diff --git a/indra/newview/skins/default/xui/fr/menu_copy_paste_color.xml b/indra/newview/skins/default/xui/fr/menu_copy_paste_color.xml
new file mode 100644
index 0000000000..9ca9d3e0d7
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_copy_paste_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Copy Paste Color Menu">
+	<menu_item_call label="Copier" name="params_copy"/>
+	<menu_item_call label="Coller" name="params_paste"/>
+</toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/fr/menu_copy_paste_features.xml b/indra/newview/skins/default/xui/fr/menu_copy_paste_features.xml
new file mode 100644
index 0000000000..939d45412b
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_copy_paste_features.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Copy Paste Features Menu">
+	<menu_item_call label="Copier" name="params_copy"/>
+	<menu_item_call label="Coller" name="params_paste"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_copy_paste_light.xml b/indra/newview/skins/default/xui/fr/menu_copy_paste_light.xml
new file mode 100644
index 0000000000..7a9eb1459e
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_copy_paste_light.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Copy Paste Light Menu">
+	<menu_item_call label="Copier" name="params_copy"/>
+	<menu_item_call label="Coller" name="params_paste"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_copy_paste_object.xml b/indra/newview/skins/default/xui/fr/menu_copy_paste_object.xml
new file mode 100644
index 0000000000..2b00bb0842
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_copy_paste_object.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Copy Paste Object Menu">
+	<menu_item_call label="Copier" name="params_copy"/>
+	<menu_item_call label="Coller" name="params_paste"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_copy_paste_pos.xml b/indra/newview/skins/default/xui/fr/menu_copy_paste_pos.xml
new file mode 100644
index 0000000000..f2489ca47b
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_copy_paste_pos.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Copy Paste Position Menu">
+	<menu_item_call label="Copier tous" name="psr_copy"/>
+	<menu_item_call label="Copier la position" name="pos_copy"/>
+	<menu_item_call label="Coller tous" name="psr_paste"/>
+	<menu_item_call label="Coller la position" name="pos_paste"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_copy_paste_rot.xml b/indra/newview/skins/default/xui/fr/menu_copy_paste_rot.xml
new file mode 100644
index 0000000000..a8d6994635
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_copy_paste_rot.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Copy Paste Rotation Menu">
+	<menu_item_call label="Copier tous" name="psr_copy"/>
+	<menu_item_call label="Copier la rotation" name="rot_copy"/>
+	<menu_item_call label="Coller tous" name="psr_paste"/>
+	<menu_item_call label="Coller la rotation" name="rot_paste"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_copy_paste_size.xml b/indra/newview/skins/default/xui/fr/menu_copy_paste_size.xml
new file mode 100644
index 0000000000..1ca13f27da
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_copy_paste_size.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Copy Paste Size Menu">
+	<menu_item_call label="Copier tous" name="psr_copy"/>
+	<menu_item_call label="Copier la taille" name="size_copy"/>
+	<menu_item_call label="Coller tous" name="psr_paste"/>
+	<menu_item_call label="Coller la taille" name="size_paste"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_copy_paste_texture.xml b/indra/newview/skins/default/xui/fr/menu_copy_paste_texture.xml
new file mode 100644
index 0000000000..a32a1f72f9
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_copy_paste_texture.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Copy Paste Texture Menu">
+	<menu_item_call label="Copier" name="params_copy"/>
+	<menu_item_call label="Coller" name="params_paste"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_inventory.xml b/indra/newview/skins/default/xui/fr/menu_inventory.xml
index 9098c3b9ff..d2b0b13b4a 100644
--- a/indra/newview/skins/default/xui/fr/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/menu_inventory.xml
@@ -117,6 +117,8 @@
 	<menu_item_call label="Enlever" name="Take Off"/>
 	<menu_item_call label="Appliquer uniquement à moi-même" name="Settings Apply Local"/>
 	<menu_item_call label="Appliquer à la parcelle" name="Settings Apply Parcel"/>
+	<menu_item_call label="Créer un dossier à partir de la sélection" name="New folder from selected"/>
+	<menu_item_call label="Dégrouper les éléments du dossier" name="Ungroup folder items"/>
 	<menu_item_call label="Copier dans les annonces Place du marché" name="Marketplace Copy"/>
 	<menu_item_call label="Déplacer dans les annonces Place du marché" name="Marketplace Move"/>
 	<menu_item_call label="--aucune option--" name="--no options--"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_pie_attachment_self.xml b/indra/newview/skins/default/xui/fr/menu_pie_attachment_self.xml
index e0b73d521a..e601a9a7a9 100644
--- a/indra/newview/skins/default/xui/fr/menu_pie_attachment_self.xml
+++ b/indra/newview/skins/default/xui/fr/menu_pie_attachment_self.xml
@@ -14,6 +14,8 @@
 			<pie_slice label="Sauvegarde" name="Backup"/>
 			<pie_slice label="Collada" name="Collada"/>
 		</pie_menu>
+		<pie_slice label="Voir dans l'inv." name="Show original"/>
+		<pie_slice label="Inspecter" name="Avatar Inspect"/>
 		<pie_slice label="Textures" name="Debug..."/>
 	</pie_menu>
 	<pie_slice label="S'asseoir ici" name="Sit Down Here"/>
@@ -22,6 +24,11 @@
 	<pie_slice label="Gestes" name="Gestures"/>
 	<pie_menu label="Apparence &gt;" name="Appearance &gt;">
 		<pie_slice label="Modifier la silhouette" name="Edit My Shape"/>
+		<pie_menu name="ResetMenu" label="Réinit. &gt;">
+			<pie_slice label="Squel. &amp; Anim." name="Reset Skeleton And Animations"/>
+			<pie_slice label="Squelette" name="Reset Skeleton"/>
+			<pie_slice label="LOD du mesh" name="Reset Mesh LOD"/>
+		</pie_menu>
 		<pie_slice label="Modifier la tenue" name="Edit My Outfit"/>
 		<pie_slice label="Dump XML" name="Dump XML"/>
 		<pie_slice label="Voltigement" name="Hover Height"/>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index a3335d8365..900949619b 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -3833,6 +3833,15 @@ Texture figée de [RESOLUTION] mise à jour localement pour [BODYREGION] au bout
 		Impossible d&apos;afficher un aperçu de cette texture car il s&apos;agit d&apos;une texture sans copie et/ou transfert.
 		<usetemplate ignoretext="M&apos;avertir que le mode Aperçu en direct n&apos;est pas disponible pour les textures sans copie et/ou transfert" name="okignore" yestext="OK"/>
 	</notification>
+	<notification name="FacePasteFailed">
+		Le collage a échoué. [REASON]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="FacePasteTexturePermissions">
+		Vous avez appliqué une texture avec des permissions limitées, l'objet héritera des permissions de la texture..
+		<usetemplate ignoretext="Coller : vous avez appliqué une texture avec des permissions limitées" name="notifyignore"/>
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmLeaveCall">
 		Voulez-vous vraiment quitter cet appel ?
 		<usetemplate ignoretext="Confirmer avant de quitter l&apos;appel" name="okcancelignore" notext="Non" yestext="Oui"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_tools_texture.xml b/indra/newview/skins/default/xui/fr/panel_tools_texture.xml
index 56c04a0337..9ae961176e 100644
--- a/indra/newview/skins/default/xui/fr/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/fr/panel_tools_texture.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Texture" name="Texture">
+	<panel.string name="paste_error_face_selection_mismatch">Lorsque plusieurs faces sont copiées, l'objet cible doit avoir le même nombre de faces sélectionnées.</panel.string>
+	<panel.string name="paste_error_object_face_count_mismatch">Lorsque toutes les faces d'un objet sont copiées, l'objet cible doit avoir le même nombre de faces.</panel.string>
+	<panel.string name="paste_error_inventory_not_found">Une ou plusieurs textures introuvables dans l'inventaire.</panel.string>
+	<panel.string name="paste_options">Copier les paramètres des textures dans le presse-papiers</panel.string>
 	<text name="color label">
 		Couleur
 	</text>
@@ -11,6 +15,8 @@
 		Rayonnement
 	</text>
 	<check_box label="Lumineux" name="checkbox fullbright"/>
+	<button name="copy_face_btn" tool_tip="Copie les paramètres des textures dans le presse-papiers"/>
+	<button name="paste_face_btn" tool_tip="Colle les paramètres des textures à partir du presse-papiers"/>
 	<combo_box name="combobox matmedia">
 		<combo_box.item label="Matériaux" name="Materials"/>
 		<combo_box.item label="Médias" name="Media"/>
@@ -109,6 +115,4 @@
 	<spinner label="Décalage vertical" name="shinyOffsetV"/>
 	<check_box initial_value="false" label="Aligner les faces Plan" name="checkbox planar align" tool_tip="Aligner les textures sur toutes les faces sélectionnées avec la dernière face sélectionnée. Application de la texture Plan requise."/>
 	<button label="Aligner" label_selected="Aligner les couches de texture actuelles" name="button align textures" tool_tip="Aligner les couches de texture actuelles"/>
-	<button label="Copie" name="copytextures"/>
-	<button label="Collé" name="pastetextures"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 4a92167ae8..97f722906a 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -6638,7 +6638,7 @@ Propriétaire précédent : [OBJECT_LAST_OWNER_ID]
 Posé par : [OBJECT_REZZER_KEY]
 Groupe : [OBJECT_GROUP]
 Date de création : [OBJECT_CREATION_TIME]
-Rezz time: [OBJECT_REZ_TIME]
+Temps pour apparaitre : [OBJECT_REZ_TIME]
 Type de cheminement : [OBJECT_PATHFINDING_TYPE]
 Point d'attache : [OBJECT_ATTACHED_POINT]
 Attaché temporairement : [OBJECT_TEMP_ATTACHED]

From f0772c850ec2f354c1d6bc7b40765df5fbb91ceb Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Sat, 6 Aug 2022 13:29:28 +0200
Subject: [PATCH 10/19] French translation - minor changes Can be modified
 later if needed

---
 indra/newview/skins/default/xui/fr/floater_tools.xml       | 2 +-
 indra/newview/skins/default/xui/fr/panel_tools_texture.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml
index 3325ed9e54..622c6f6aa0 100644
--- a/indra/newview/skins/default/xui/fr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tools.xml
@@ -125,7 +125,7 @@
 	<text name="selection_empty">
 		Aucune sélection effectuée.
 	</text>
-	<text name="remaining_capacity">
+	<text name="more info label">
 		[secondlife:///app/openfloater/object_weights Plus d&apos;infos]
 	</text>
 	<tab_container name="Object Info Tabs">
diff --git a/indra/newview/skins/default/xui/fr/panel_tools_texture.xml b/indra/newview/skins/default/xui/fr/panel_tools_texture.xml
index 9ae961176e..3a08c70e7f 100644
--- a/indra/newview/skins/default/xui/fr/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/fr/panel_tools_texture.xml
@@ -9,10 +9,10 @@
 	</text>
 	<color_swatch label="" name="colorswatch" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
 	<text name="color trans">
-		% de transparence
+		Transparence
 	</text>
 	<text name="glow label">
-		Rayonnement
+		Lueur
 	</text>
 	<check_box label="Lumineux" name="checkbox fullbright"/>
 	<button name="copy_face_btn" tool_tip="Copie les paramètres des textures dans le presse-papiers"/>

From 1147d8ee1e0dc6f364bf42e29af705c6ebff6337 Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@posteo.nl>
Date: Sun, 7 Aug 2022 14:22:52 +0200
Subject: [PATCH 11/19] Update fmodstudio

---
 autobuild.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index d3faf9adf4..5a5d70e85f 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1098,11 +1098,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>9aac95d85fd3f044da3fd9dd44ed5ca2</string>
+              <string>21d50d222f005c033452ee3fad44bff1</string>
               <key>hash_algorithm</key>
               <string>md5</string>
               <key>url</key>
-              <string>file:///opt/firestorm/fmodstudio-2.02.06-linux64_bionic-220911506.tar.bz2</string>
+              <string>file:///opt/firestorm/fmodstudio-2.02.07-linux64_bionic-222191132.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux64</string>

From 6beaf27b7ca1df253d009ec8d6d8eff680b106ae Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sun, 7 Aug 2022 21:22:22 +0200
Subject: [PATCH 12/19] Create SUP ticket instead of FIRE when reporting a
 problem

---
 indra/newview/app_settings/settings.xml            | 2 +-
 indra/newview/skins/default/xui/de/menu_viewer.xml | 2 +-
 indra/newview/skins/default/xui/en/menu_viewer.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 0b11e15f3e..6b135f3429 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13974,7 +13974,7 @@ Change of this parameter will affect the layout of buttons in notification toast
 			<key>Type</key>
 			<string>String</string>
 			<key>Value</key>
-			<string>https://jira.firestormviewer.org/secure/CreateIssueDetails!init.jspa?pid=10005&amp;issuetype=1&amp;priority=3&amp;environment=[ENVIRONMENT]</string>
+			<string>https://jira.firestormviewer.org/secure/CreateIssueDetails!init.jspa?pid=10003&amp;issuetype=8&amp;priority=3&amp;environment=[ENVIRONMENT]</string>
 		</map>
 	<key>RevokePermsOnStopAnimation</key>
     <map>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 6725ae28cc..f1f1af43b9 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -270,7 +270,7 @@
 		<menu_item_call label="Über [CURRENT_GRID]" name="current_grid_about"/>
 		<menu_item_call label="Grid-Status prüfen" name="Grid Status"/>
 		<menu_item_call label="Missbrauch melden" name="Report Abuse"/>
-		<menu_item_call label="Fehler melden" name="Report Bug"/>
+		<menu_item_call label="Problem melden" name="Report Bug"/>
 		<menu_item_call label="Rempler, Stöße &amp; Schläge" name="Bumps, Pushes &amp;amp; Hits"/>
 		<menu_item_check label="Sysinfo-Button aktivieren" name="Enable Sysinfo Button"/>
 		<menu_item_call label="Info über [APP_NAME]" name="About Second Life"/>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 74e0016943..d3f9b6822a 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2519,7 +2519,7 @@
                  function="ReportAbuse" />
             </menu_item_call>
         <menu_item_call
-             label="Report Bug"
+             label="Report Problem"
              name="Report Bug">
                 <menu_item_call.on_click
                  function="Advanced.ReportBug"/>

From 149ff97e257d9cebd84a024b2753609e63a1fc99 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Mon, 8 Aug 2022 00:51:32 +0200
Subject: [PATCH 13/19] Updated Polish translation

---
 indra/newview/skins/default/xui/en/menu_login.xml    | 2 +-
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 indra/newview/skins/default/xui/pl/menu_login.xml    | 2 +-
 indra/newview/skins/default/xui/pl/menu_viewer.xml   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index cd4d386de6..4d24c68edc 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -128,7 +128,7 @@
         <menu_item_separator/>       
 -->
         <menu_item_call
-             label="Report Bug"
+             label="Report Problem"
              name="Report Bug">
                 <menu_item_call.on_click
                  function="Advanced.ReportBug"/>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 052baaeec8..10ef17b3da 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -12434,7 +12434,7 @@ Try selecting a smaller piece of land.
    <tag>fail</tag>
 Can't divide land.
 Can't find the parcel.
-Please report with Help -> Report Bug...
+Please report with Help -> Report Problem...
   </notification>
 
   <notification
diff --git a/indra/newview/skins/default/xui/pl/menu_login.xml b/indra/newview/skins/default/xui/pl/menu_login.xml
index 180e61fcfb..38778fa432 100644
--- a/indra/newview/skins/default/xui/pl/menu_login.xml
+++ b/indra/newview/skins/default/xui/pl/menu_login.xml
@@ -16,7 +16,7 @@
 		<menu_item_call label="Portal wsparcia" name="Support portal"/>
 		<menu_item_call label="Newsy: [SECOND_LIFE]" name="Second Life News"/>
 		<menu_item_call label="Blogi: [SECOND_LIFE]" name="Second Life Blogs"/> -->
-		<menu_item_call label="Zgłoś błędy klienta" name="Report Bug"/>
+		<menu_item_call label="Zgłoś problem" name="Report Bug"/>
 		<menu_item_call label="Informacje o [APP_NAME]" name="About Second Life"/>
 		<menu_item_call label="Pomoc dla [CURRENT_GRID]" name="current_grid_help_login"/>
 		<menu_item_call label="Informacje o [CURRENT_GRID]" name="current_grid_about_login"/>
diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml
index d43f1c16e2..99e832dc54 100644
--- a/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -286,7 +286,7 @@
 		<menu_item_call label="Blogi: [SECOND_LIFE]" name="Second Life Blogs"/> -->
 		<menu_item_check label="Sprawdź stan świata" name="Grid Status"/>
 		<menu_item_call label="Zgłoś nadużycie" name="Report Abuse"/>
-		<menu_item_call label="Zgłoś błędy klienta" name="Report Bug"/>
+		<menu_item_call label="Zgłoś problem" name="Report Bug"/>
 		<menu_item_call label="Zderzenia, popchnięcia i uderzenia" name="Bumps, Pushes &amp;amp; Hits"/>
 		<menu_item_check label="Włącz przycisk Sysinfo" name="Enable Sysinfo Button"/>
 		<menu_item_call label="Informacje o [APP_NAME]" name="About Second Life"/>

From c9728f120824ee1791386e1154975b64740800f5 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Mon, 8 Aug 2022 19:45:27 +0200
Subject: [PATCH 14/19] FIRE-31916 French translation update, by Laurent Bechir

---
 indra/newview/skins/default/xui/fr/menu_login.xml    | 2 +-
 indra/newview/skins/default/xui/fr/menu_viewer.xml   | 2 +-
 indra/newview/skins/default/xui/fr/notifications.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/newview/skins/default/xui/fr/menu_login.xml b/indra/newview/skins/default/xui/fr/menu_login.xml
index 5d578e6aa9..a824cf9ef5 100644
--- a/indra/newview/skins/default/xui/fr/menu_login.xml
+++ b/indra/newview/skins/default/xui/fr/menu_login.xml
@@ -7,7 +7,7 @@
 	<menu label="Aide" name="Help">
 		<menu_item_call label="Wiki Firestorm" name="Firestorm Wiki"/>
 		<menu_item_call label="Dépannage" name="Troubleshooting"/>
-		<menu_item_call label="Signaler un bug" name="Report Bug"/>
+		<menu_item_call label="Signaler un problème" name="Report Bug"/>
 		<menu_item_call label="À propos de [APP_NAME]" name="About Second Life"/>
 		<menu_item_call label="Aide [CURRENT_GRID]" name="current_grid_help_login"/>
 		<menu_item_call label="À propos de [CURRENT_GRID]" name="current_grid_about_login"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 147259e35c..058a299cb9 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -263,7 +263,7 @@
 		<menu_item_call label="À propos de [CURRENT_GRID]" name="current_grid_about"/>
 		<menu_item_check label="Consulter l'état de la grille" name="Grid Status"/>
 		<menu_item_call label="Signaler une infraction" name="Report Abuse"/>
-		<menu_item_call label="Signaler un bug" name="Report Bug"/>
+		<menu_item_call label="Signaler un problème" name="Report Bug"/>
 		<menu_item_call label="Collisions, coups et bousculades" name="Bumps, Pushes &amp;amp; Hits"/>
 		<menu_item_check label="Activer le bouton Sysinfo" name="Enable Sysinfo Button"/>
 		<menu_item_call label="À propos de [APP_NAME]" name="About Second Life"/>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 900949619b..ec79a18bfc 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -4893,7 +4893,7 @@ Veuillez sélectionner un terrain plus petit.
 	<notification name="CantDivideLandCantFindParcel">
 		Division du terrain impossible.
 Parcelle introuvable.
-Veuillez utiliser Aide &gt; Signaler un bug pour signaler le problème...
+Veuillez le signaler avec Aide &gt; Signaler un problème...
 	</notification>
 	<notification name="CantDivideLandWholeParcelSelected">
 		Division du terrain impossible. La parcelle entière est sélectionnée.

From 08acbbec54a14a0a4e4ed2c07bc0378073543ab7 Mon Sep 17 00:00:00 2001
From: Zi Ree <zi.ree@phoenixviewer.com>
Date: Tue, 9 Aug 2022 14:48:20 +0200
Subject: [PATCH 15/19] Linux SDL2 - Make SDL2 default, remove USE__SDL2 flag,
 add USE_SDL1 flag instead to go back to SDL1 if needed

---
 indra/cmake/LLWindow.cmake    | 2 +-
 indra/llwindow/CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake
index 1b0370cc14..58b842f4b5 100644
--- a/indra/cmake/LLWindow.cmake
+++ b/indra/cmake/LLWindow.cmake
@@ -18,7 +18,7 @@ if (USESYSTEMLIBS)
       )
 else (USESYSTEMLIBS)
   if (LINUX)
-    if( NOT USE_SDL2 )
+    if( USE_SDL1 )
       use_prebuilt_binary(SDL)
       set (SDL_FOUND TRUE)
 	  
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
index 299a434d76..69beec1c19 100644
--- a/indra/llwindow/CMakeLists.txt
+++ b/indra/llwindow/CMakeLists.txt
@@ -81,7 +81,7 @@ if (LINUX)
       libfreetype.a
       )
 
-  if( NOT USE_SDL2 )
+  if( USE_SDL1 )
     list(APPEND viewer_SOURCE_FILES
             llkeyboardsdl.cpp
             llwindowsdl.cpp

From 7d8da40d6f0b42401049295af4eaaa85dcdb292a Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 10 Aug 2022 00:49:01 +0200
Subject: [PATCH 16/19] FIRE-15917 / FIRE-31906: Shot in the blue fix attempt
 for mesh attachments sometimes vanishing after teleports

---
 indra/newview/llviewerdisplay.cpp | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 0b2b13536b..45a1388378 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -102,6 +102,9 @@ F32			gSavedDrawDistance = 0.0f;
 F32			gLastDrawDistanceStep = 0.0f;
 // <FS:Ansariel> FIRE-12004: Attachments getting lost on TP
 LLFrameTimer gPostTeleportFinishKillObjectDelayTimer;
+// <FS:Ansariel> FIRE-15917 / FIRE-31906: Mesh attachments sometimes vanish after teleports
+bool postTeleportResetVB = false;
+LLFrameTimer postTeleportResetVBTimer;
 
 BOOL gForceRenderLandFence = FALSE;
 BOOL gDisplaySwapBuffers = FALSE;
@@ -332,6 +335,18 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 	stop_glerror();
 
 	gPipeline.disableLights();
+
+	// <FS:Ansariel> FIRE-15917 / FIRE-31906: Mesh attachments sometimes vanish after teleports
+	static LLCachedControl<F32> teleportArrivalDelay(gSavedSettings, "TeleportArrivalDelay");
+	static LLCachedControl<bool> fsDisableTeleportScreens(gSavedSettings, "FSDisableTeleportScreens");
+	if (postTeleportResetVB && (!fsDisableTeleportScreens || postTeleportResetVBTimer.getElapsedTimeF32() > teleportArrivalDelay()))
+	{
+		LL_INFOS("Teleport") << "Resetting Vertex Buffers after TP finished" << LL_ENDL;
+		postTeleportResetVB = false;
+		postTeleportResetVBTimer.stop();
+		gPipeline.resetVertexBuffers();
+	}
+	// </FS:Ansariel>
 	
 	//reset vertex buffers if needed
 	gPipeline.doResetVertexBuffers();
@@ -597,6 +612,10 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 			// No teleport in progress
 			gViewerWindow->setShowProgress(FALSE,FALSE);
 			gTeleportDisplay = FALSE;
+			// <FS:Ansariel> FIRE-15917 / FIRE-31906: Mesh attachments sometimes vanish after teleports
+			postTeleportResetVB = true;
+			postTeleportResetVBTimer.start();
+			// </FS:Ansariel>
 			break;
 		}
 	}

From 59e8ee021eabe378116ca0c9ab887d0f53bbdb28 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 10 Aug 2022 01:21:13 +0200
Subject: [PATCH 17/19] Remove duplicate assert

---
 indra/llmath/lloctree.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h
index 55d6cc9348..9d12929323 100644
--- a/indra/llmath/lloctree.h
+++ b/indra/llmath/lloctree.h
@@ -852,8 +852,6 @@ public:
 
 				llassert(size[0] >= gOctreeMinSize);
 
-				llassert(size[0] >= gOctreeMinSize);
-
 				//copy our children to a new branch
 				LLOctreeNode<T>* newnode = new LLOctreeNode<T>(center, size, this);
 				

From 5e949d4540cf0e5095da18159b5a3db6be0458f0 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 10 Aug 2022 01:46:41 +0200
Subject: [PATCH 18/19] FIRE-15917 / FIRE-31906: Exempt local teleports

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

diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 45a1388378..4b64eda9db 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -338,8 +338,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 
 	// <FS:Ansariel> FIRE-15917 / FIRE-31906: Mesh attachments sometimes vanish after teleports
 	static LLCachedControl<F32> teleportArrivalDelay(gSavedSettings, "TeleportArrivalDelay");
-	static LLCachedControl<bool> fsDisableTeleportScreens(gSavedSettings, "FSDisableTeleportScreens");
-	if (postTeleportResetVB && (!fsDisableTeleportScreens || postTeleportResetVBTimer.getElapsedTimeF32() > teleportArrivalDelay()))
+	if (postTeleportResetVB && postTeleportResetVBTimer.getElapsedTimeF32() > teleportArrivalDelay())
 	{
 		LL_INFOS("Teleport") << "Resetting Vertex Buffers after TP finished" << LL_ENDL;
 		postTeleportResetVB = false;
@@ -571,6 +570,11 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 
 			// <FS:Ansariel> FIRE-12004: Attachments getting lost on TP
 			gPostTeleportFinishKillObjectDelayTimer.reset();
+
+			// <FS:Ansariel> FIRE-15917 / FIRE-31906: Mesh attachments sometimes vanish after teleports
+			postTeleportResetVB = true;
+			postTeleportResetVBTimer.start();
+			// </FS:Ansariel>
 			break;
 
 		case LLAgent::TELEPORT_ARRIVING:
@@ -612,10 +616,6 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 			// No teleport in progress
 			gViewerWindow->setShowProgress(FALSE,FALSE);
 			gTeleportDisplay = FALSE;
-			// <FS:Ansariel> FIRE-15917 / FIRE-31906: Mesh attachments sometimes vanish after teleports
-			postTeleportResetVB = true;
-			postTeleportResetVBTimer.start();
-			// </FS:Ansariel>
 			break;
 		}
 	}

From 1c7abe654cc706de1af8b67aca501cb603c20f53 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 10 Aug 2022 09:11:42 +0200
Subject: [PATCH 19/19] Update German translation

---
 indra/newview/skins/default/xui/de/menu_login.xml    | 2 +-
 indra/newview/skins/default/xui/de/notifications.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/skins/default/xui/de/menu_login.xml b/indra/newview/skins/default/xui/de/menu_login.xml
index 969d486194..0527a0115e 100644
--- a/indra/newview/skins/default/xui/de/menu_login.xml
+++ b/indra/newview/skins/default/xui/de/menu_login.xml
@@ -16,7 +16,7 @@
 		<menu_item_call label="Support-Portal" name="Support portal"/>
 		<menu_item_call label="[SECOND_LIFE]-Neuigkeiten" name="Second Life News"/>
 		<menu_item_call label="[SECOND_LIFE]-Blogs" name="Second Life Blogs"/>
-		<menu_item_call label="Fehler melden" name="Report Bug"/>
+		<menu_item_call label="Problem melden" name="Report Bug"/>
 		<menu_item_call label="[APP_NAME]-Hilfe" name="Second Life Help"/>
 		<menu_item_call label="Info über [APP_NAME]" name="About Second Life"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 0a3d43d6fc..52cbe3d805 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -4587,7 +4587,7 @@ Wählen Sie eine kleinere Landfläche aus.
 	<notification name="CantDivideLandCantFindParcel">
 		Land kann nicht geteilt werden.
 Parzelle kann nicht gefunden werden.
-Bitte melden Sie den Fehler über „Hilfe“ -&gt; „Fehler melden“.
+Bitte melden Sie das Problem über „Hilfe“ -&gt; „Problem melden“.
 	</notification>
 	<notification name="CantDivideLandWholeParcelSelected">
 		Land kann nicht geteilt werden. Die gesamte Parzelle ist ausgewählt.