From b1c5ab95ccd12298d261357e5cf427f8e333e7d8 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Tue, 27 Aug 2024 19:42:39 +0200
Subject: [PATCH 01/28] Make sure to write to the correct destination buffer

---
 indra/newview/pipeline.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 83f564c6e3..4f1c108327 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -7715,7 +7715,9 @@ void LLPipeline::renderFinalize()
     // </FS:Beq>
     if (RenderBufferVisualization > -1)
     {
-        finalBuffer = &mPostMap;
+        // <FS:Ansariel> Vignette / Vision sphere: Need to write to the previous source buffer agai
+        //finalBuffer = &mPostMap;
+        finalBuffer = activeBuffer;
         switch (RenderBufferVisualization)
         {
         case 0:

From e5709f57310a0c9913fe35b71949d77f51db1dc7 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Wed, 28 Aug 2024 00:38:03 +0200
Subject: [PATCH 02/28] Updated Polish translation

---
 .../xui/pl/floater_change_item_thumbnail.xml  |  6 +++
 .../floater_preferences_graphics_advanced.xml | 16 +++++--
 .../default/xui/pl/menu_gallery_inventory.xml | 33 +++++++++++++
 .../default/xui/pl/menu_nearby_media.xml      |  5 ++
 .../skins/default/xui/pl/menu_object.xml      |  4 ++
 .../skins/default/xui/pl/menu_viewer.xml      | 14 +++++-
 .../skins/default/xui/pl/notifications.xml    | 25 +++++++++-
 .../xui/pl/panel_fs_performance_nearby.xml    |  9 +++-
 .../xui/pl/panel_preferences_graphics1.xml    | 28 +++++------
 .../xui/pl/panel_preferences_sound.xml        | 14 +++++-
 ...panel_region_terrain_texture_transform.xml | 28 +++++++++++
 .../pl/panel_settings_terrain_elevation.xml   | 47 +++++++++++++++++++
 .../pl/panel_settings_terrain_transform.xml   | 18 +++++++
 13 files changed, 225 insertions(+), 22 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/pl/menu_nearby_media.xml
 create mode 100644 indra/newview/skins/default/xui/pl/panel_region_terrain_texture_transform.xml
 create mode 100644 indra/newview/skins/default/xui/pl/panel_settings_terrain_elevation.xml
 create mode 100644 indra/newview/skins/default/xui/pl/panel_settings_terrain_transform.xml

diff --git a/indra/newview/skins/default/xui/pl/floater_change_item_thumbnail.xml b/indra/newview/skins/default/xui/pl/floater_change_item_thumbnail.xml
index 33b354de58..d6d38f7bff 100644
--- a/indra/newview/skins/default/xui/pl/floater_change_item_thumbnail.xml
+++ b/indra/newview/skins/default/xui/pl/floater_change_item_thumbnail.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="change_item_thumbnail" title="Zmień zdjęcie przedmiotu">
+	<floater.string name="multiple_item_names">
+		Wybrano wiele elementów
+	</floater.string>
 	<floater.string name="title_item_thumbnail">
 		Zmień zdjęcie przedmiotu
 	</floater.string>
@@ -24,6 +27,9 @@
 	<floater.string name="tooltip_remove_image">
 		Usuń zdjęcie
 	</floater.string>
+	<text name="multiple_lbl">
+		Wiele miniatur
+	</text>
 	<text name="tooltip_text">
 		podpowiedź
 	</text>
diff --git a/indra/newview/skins/default/xui/pl/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/pl/floater_preferences_graphics_advanced.xml
index 71f88ba6a5..d6db077330 100644
--- a/indra/newview/skins/default/xui/pl/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preferences_graphics_advanced.xml
@@ -9,10 +9,19 @@
 	<text name="PostProcessText">
 		Niska
 	</text>
+	<slider label="Maks. świateł:" name="MaxLights" />
 	<check_box label="Włącz VSync" name="vsync" tool_tip="Synchronizuje liczbę klatek na sekundę z częstotliwością odświeżania monitora, może skutkować zmniejszeniem widocznej płynności i opóźnieniami." />
 	<text name="AvatarText">
 		Awatar
 	</text>
+	<text name="AvatarComplexityModeLabel">
+		Render awatarów:
+	</text>
+	<combo_box name="AvatarComplexityMode">
+		<combo_box.item label="Ogranicz po złożonośći" name="0" />
+		<combo_box.item label="Zawsze pokazuj znajomych" name="1" />
+		<combo_box.item label="Pokazuj tylko znajomych" name="2" />
+	</combo_box>
 	<slider tool_tip="Kontroluje w jakim momencie awatar, który jest graficznie złożony zostanie zastąpiony przez mniej obciążającą komputer formę (tzw. JellyDoll)" label="Maks. szczegółowość awatarów:" name="IndirectMaxComplexity" />
 	<slider label="Maks. il. wyświetlanych awatarów:" name="IndirectMaxNonImpostors" />
 	<slider label="Detale:" name="AvatarMeshDetail" />
@@ -102,10 +111,9 @@
 		Odświeżanie luster:
 	</text>
 	<combo_box name="HeroProbeUpdateRate">
-		<combo_box.item label="W każdej klatce" name="0" />
-		<combo_box.item label="Co 2 klatkę" name="1" />
-		<combo_box.item label="Co 3 klatkę" name="2" />
-		<combo_box.item label="Co 4 klatkę" name="3" />
+		<combo_box.item label="Powoli" name="6"/>
+		<combo_box.item label="Średnio" name="3" />
+		<combo_box.item label="Szybko" name="1" />
 	</combo_box>
 	<button label="Zresetuj wartości ustawień grafiki" name="Defaults" />
 	<button label="Anuluj" label_selected="Anuluj" name="Cancel" />
diff --git a/indra/newview/skins/default/xui/pl/menu_gallery_inventory.xml b/indra/newview/skins/default/xui/pl/menu_gallery_inventory.xml
index 81a4732e1c..00753322a5 100644
--- a/indra/newview/skins/default/xui/pl/menu_gallery_inventory.xml
+++ b/indra/newview/skins/default/xui/pl/menu_gallery_inventory.xml
@@ -49,6 +49,39 @@
 	<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 label="Utwórz nowe" name="create_new">
+		<menu_item_call label="Nowy folder" name="New Folder" />
+		<menu_item_call label="Nowy skrypt" name="New Script" />
+		<menu_item_call label="Nowa nota" name="New Note" />
+		<menu_item_call label="Nowy gest" name="New Gesture" />
+		<menu_item_call label="Nowy materiał" name="New Material" />
+		<menu label="Nowe ubranie" name="New Clothes">
+			<menu_item_call label="Nowa koszula" name="New Shirt" />
+			<menu_item_call label="Nowe spodnie" name="New Pants" />
+			<menu_item_call label="Nowe buty" name="New Shoes" />
+			<menu_item_call label="Nowe skarpety" name="New Socks" />
+			<menu_item_call label="Nowa kurtka" name="New Jacket" />
+			<menu_item_call label="Nowa spódnica" name="New Skirt" />
+			<menu_item_call label="Nowe rękawiczki" name="New Gloves" />
+			<menu_item_call label="Nowy podkoszulek" name="New Undershirt" />
+			<menu_item_call label="Nowa bielizna" name="New Underpants" />
+			<menu_item_call label="Nowa warstwa alpha" name="New Alpha Mask" />
+			<menu_item_call label="Nowy tatuaż" name="New Tattoo" />
+			<menu_item_call label="Nowa warstwa uniwersalna" name="New Universal" />
+			<menu_item_call label="Nowa fizyka" name="New Physics" />
+		</menu>
+		<menu label="Nowa część ciała" name="New Body Parts">
+			<menu_item_call label="Nowy kształt" name="New Shape" />
+			<menu_item_call label="Nowa skórka" name="New Skin" />
+			<menu_item_call label="Nowe włosy" name="New Hair" />
+			<menu_item_call label="Nowe oczy" name="New Eyes" />
+		</menu>
+		<menu label="Nowe otoczenie" name="New Settings">
+			<menu_item_call label="Nowe niebo" name="New Sky" />
+			<menu_item_call label="Nowa woda" name="New Water" />
+			<menu_item_call label="Nowy cykl dnia" name="New Day Cycle" />
+		</menu>
+	</menu>
 	<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 label="Ustaw jako domyślne" name="upload_def">
diff --git a/indra/newview/skins/default/xui/pl/menu_nearby_media.xml b/indra/newview/skins/default/xui/pl/menu_nearby_media.xml
new file mode 100644
index 0000000000..65a23e7f91
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_nearby_media.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_nearby_media">
+	<menu_item_call label="Kopiuj adres URL" name="copy_url" />
+	<menu_item_call label="Kopiuj dane" name="copy_data" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_object.xml b/indra/newview/skins/default/xui/pl/menu_object.xml
index 3e8d2bd8a6..5889ed223b 100644
--- a/indra/newview/skins/default/xui/pl/menu_object.xml
+++ b/indra/newview/skins/default/xui/pl/menu_object.xml
@@ -43,6 +43,10 @@
 	<menu_item_call label="Zwróć" name="Return..."/>
 	<menu_item_call label="Weź" name="Pie Object Take"/>
 	<menu_item_call label="Weź kopię" name="Take Copy"/>
+	<menu_item_call label="Weź jako: podniesione razem" name="Take combined" />
+	<menu_item_call label="Weź kopię jako: podniesione razem" name="Take Copy combined" />
+	<menu_item_call label="Weź jako: oddzielne obiekty" name="Take Separate" />
+	<menu_item_call label="Weź kopie jako: oddzielne obiekty" name="Take Copy Separate" />
 	<menu_item_call label="Zapłać" name="Pay..."/>
 	<menu_item_call label="Kup" name="Buy..."/>
 	<context_menu label="Zapisz jako" name="Export Menu">
diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml
index 3721e457ae..d371227689 100644
--- a/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -170,6 +170,11 @@
 		<menu_item_call label="Eksplorator animacji" name="Animation Explorer"/>
 		<menu_item_call label="Czarna lista zasobów danych (assetów)" name="asset_blacklist"/>
 		<menu_item_call label="Ustawienia renderowania awatarów" name="Avatar Render Settings"/>
+		<menu label="Render awatarów" name="AvatarComplexityMode">
+			<menu_item_check label="Ogranicz po złożonośći" name="complexity_limit_everone" />
+			<menu_item_check label="Zawsze pokazuj znajomych" name="complexity_always_show_friends" />
+			<menu_item_check label="Pokazuj tylko znajomych" name="complexity_only_show_friends" />
+		</menu>
 		<menu_item_check label="Renderuj tylko znajomych" name="Render Friends Only"/>
 	</menu>
 	<menu label="Buduj" name="BuildTools">
@@ -460,6 +465,12 @@
 			<menu_item_call label="Wymuś rozłączenie Przeglądarki" name="Force Disconnect Viewer"/>
 			<menu_item_call label="Symulacja wycieku pamięci" name="Memory Leaking Simulation"/>
 		</menu>
+		<menu name="GLTF">
+			<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>
+		<menu label="Wideo" name="Video" />
 		<menu label="Testy renderowania" name="Render Tests">
 			<menu_item_check label="Kamera poza zasiegiem" name="Camera Offset"/>
 			<menu_item_check label="Losowa ilość klatek" name="Randomize Framerate"/>
@@ -467,7 +478,6 @@
 			<menu_item_call label="Profil klatek obrazu" name="Frame Profile"/>
 			<menu_item_call label="Testowanie (benchmark)" name="Benchmark"/>
 			<menu_item_call label="Podgląd HDRI" name="HDRI Preview" />
-			<menu_item_call label="Podgląd sceny GLTF" name="GLTF Scene Preview" />
 		</menu>
 		<menu label="Renderowanie metadanych" name="Render Metadata">
 			<menu_item_check label="Bryły brzegowe (Bounding Boxes)" name="Bounding Boxes"/>
@@ -606,6 +616,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="Renderuj tylko znajomych" name="Render Only Friends" />
 			</menu>
 			<menu label="Szybkość animacji" name="Animation Speed">
 				<menu_item_call label="Wszystkie animacje 10% szybciej" name="All Animations 10 Faster"/>
@@ -620,6 +631,7 @@
 			<menu_item_check label="Debuguj aktualizacje stawów" name="Debug Joint Updates"/>
 			<menu_item_check label="Wyłącz poziomy detali (LOD)" name="Disable LOD"/>
 			<menu_item_check label="Debuguj VIs postaci" name="Debug Character Vis"/>
+			<menu_item_check label="Debuguj stan załadowania postaci" name="Debug Character Rez State" />
 			<menu_item_check label="Pokaż szkielet kolizji" name="Show Collision Skeleton"/>
 			<menu_item_check label="Pokaż kości" name="Show Bones"/>
 			<menu_item_check label="Wyświetl cel Agenta" name="Display Agent Target"/>
diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml
index 8ecc220fee..7df17bbe3a 100644
--- a/indra/newview/skins/default/xui/pl/notifications.xml
+++ b/indra/newview/skins/default/xui/pl/notifications.xml
@@ -2450,6 +2450,9 @@ Przed usunięciem tych elementów należy je najpierw czymś zastąpić.
 	<notification name="ThumbnailOutfitPhoto">
 		Aby dodać obraz do stroju, użyj okna galerii strojów lub kliknij prawym przyciskiem myszy na folderze stroju i wybierz "zdjęcie..."
 	</notification>
+	<notification name="ThumbnailSelectionTooLarge">
+		Możesz modyfikować maksymalnie 50 miniatur na raz.
+	</notification>
 	<notification name="ConfirmUnlink">
 		Na pewno chcesz rozłączyć zaznaczony obiekt?
 		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Rozłącz"/>
@@ -3517,6 +3520,11 @@ Jeśli jesteś użytkownikiem premium, to [[PREMIUM_URL] kliknij tutaj] aby otrz
 	<notification name="VoiceEffectsNew">
 		Nowe Przekształcenia Głosu są dostępne!
 	</notification>
+	<notification name="VoiceEffectsNotSupported">
+		Ta przeglądarka nie obsługuje funkcji Przekształcania Głosu.
+Aby uzyskać więcej informacji na temat innych narzędzi do przekształcania głosu, zapoznaj się z [[FAQ_URL] tym artykułem].
+		<usetemplate ignoretext="Ostrzegaj mnie, że Przekształcanie Głosu nie jest obsługiwane" name="okignore" />
+	</notification>
 	<notification name="Cannot enter parcel: not a group member">
 		Nie masz dostępu do działki, nie należysz do właściwej grupy.
 	</notification>
@@ -5385,9 +5393,24 @@ Czy chcesz kontynuować?
 		Edytujesz niebo inne niż HDR, które zostało automatycznie przekonwertowane na HDR. Aby usunąć HDR i mapowanie tonów, ustaw Nastrój Sondy Refleksyjnej na zero.
 		<usetemplate ignoretext="Ostrzeżenie dotyczące regulacji HDR nieba" name="okignore" />
 	</notification>
-	<notification name="GLTFPreviewSelection">
+	<notification name="GLTFOpenSelection">
 		Musisz wybrać obiekt, który będzie działał jako uchwyt dla podglądanego zasobu GLTF.
 	</notification>
+	<notification name="GLTFLoadFailed">
+		Nie udało się załadować pliku GLTF. Szczegóły znajdziesz w logu.
+	</notification>
+	<notification name="GLTFSaveFailed">
+		Nie udało się zapisać pliku GLTF. Szczegóły znajdziesz w logu.
+	</notification>
+	<notification name="GLTFSaveSelection">
+		Musisz wybrać obiekt, który ma dowiązany zasób GLTF.
+	</notification>
+	<notification name="GLTFUploadSelection">
+		Musisz wybrać obiekt, który ma dowiązany (wyłącznie lokalny) zasób GLTF.
+	</notification>
+	<notification name="GLTFUploadInProgress">
+		Przesyłanie jest obecnie w toku. Spróbuj ponownie później.
+	</notification>
 	<notification name="EnableAutoFPSWarning">
 		Zamierzasz włączyć funkcję AutoFPS. Wszystkie niezapisane ustawienia grafiki zostaną utracone.
 
diff --git a/indra/newview/skins/default/xui/pl/panel_fs_performance_nearby.xml b/indra/newview/skins/default/xui/pl/panel_fs_performance_nearby.xml
index 146f4bd8c5..59fed3134b 100644
--- a/indra/newview/skins/default/xui/pl/panel_fs_performance_nearby.xml
+++ b/indra/newview/skins/default/xui/pl/panel_fs_performance_nearby.xml
@@ -29,7 +29,14 @@
 	<text name="av_nearby_desc3">
 		Twój własny awatar zawiera narzut przeglądarki. Na karcie dodatków zobaczysz jak wpływasz na innych.
 	</text>
-	<check_box label="Znajomi zawsze z pełnymi detalami" name="display_friends" />
+	<text name="AvatarComplexityMode_Label">
+		Render awatarów:
+	</text>
+	<combo_box name="AvatarComplexityMode">
+		<combo_box.item label="Ogranicz po złożonośći" name="complexity_limit_everone" />
+		<combo_box.item label="Zawsze pokazuj znajomych" name="complexity_always_show_friends" />
+		<combo_box.item label="Pokazuj tylko znajomych" name="complexity_only_show_friends" />
+	</combo_box>
 	<button label="Wyjątki..." name="exceptions_btn" />
 	<check_box label="Całkowicie ukryj awatary" name="hide_avatars" />
 	<text name="name_tags_textbox">
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml
index 99c8a10e82..3392908838 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml
@@ -17,6 +17,7 @@
 			<text name="BetterText">
 				Jakość
 			</text>
+			<button tool_tip="Zresetuj wartości ustawień graficznych." name="Defaults" />
 			<text name="ShadersPrefText">
 				Niska
 			</text>
@@ -73,20 +74,28 @@
 				Odświeżanie luster:
 			</text>
 			<combo_box name="HeroProbeUpdateRate">
-				<combo_box.item label="W każdej klatce" name="0" />
-				<combo_box.item label="Co 2 klatkę" name="1" />
-				<combo_box.item label="Co 3 klatkę" name="2" />
-				<combo_box.item label="Co 4 klatkę" name="3" />
+				<combo_box.item label="Powoli" name="6"/>
+				<combo_box.item label="Średnio" name="3" />
+				<combo_box.item label="Szybko" name="1" />
 			</combo_box>
 			<check_box label="Pełny ekran" name="Fullscreen Mode" tool_tip="Uruchamia Firestorma na pełnym ekranie. Aby zmienić tryb wymagany jest restart."/>
 			<slider label="Pole widzenia" name="DrawDistance"/>
 			<slider label="Maks. ilość cząsteczek" name="MaxParticleCount"/>
+			<text name="AvatarComplexityModeLabel">
+				Render awatarów
+			</text>
+			<combo_box name="AvatarComplexityMode">
+				<combo_box.item label="Ogranicz po złożonośći" name="0" />
+				<combo_box.item label="Zawsze pokazuj znajomych" name="1" />
+				<combo_box.item label="Pokazuj tylko znajomych" name="2" />
+			</combo_box>
 			<slider label="Maks. złożoność awatarów" name="IndirectMaxComplexity" tool_tip="Kontroluje w jakim momencie awatar, który jest graficznie złożony zostanie zastąpiony przez mniej obciążającą komputer formę (tzw. JellyDoll)" />
 			<slider label="Maks. il. wyświetlanych awatarów" name="IndirectMaxNonImpostors"/>
 			<slider label="Jakość post-procesu" name="RenderPostProcess"/>
 			<text name="PostProcessText">
 				Niska
 			</text>
+			<slider label="Maks. świateł" name="MaxLights" />
 			<slider label="Fizyka awatarów" name="AvatarPhysicsDetail"/>
 			<slider label="Ekspozycja" name="RenderExposure" />
 			<text name="MeshDetailText">
@@ -104,7 +113,6 @@
 			<button label="Zapisz" name="PrefSaveButton" left="270" />
 			<button label="Wczytaj" name="PrefLoadButton" />
 			<button label="Usuń" name="PrefDeleteButton" />
-			<button tool_tip="Zresetuj wartości ustawień graficznych." name="Defaults"/>
 		</panel>
 		<panel label="Ustawienia sprzętowe" name="Hardware Settings">
 			<check_box label="Filtrowanie anizotropowe (wolniej, gdy włączone)" name="ani" tool_tip="To pole wyboru włącza filtrowanie anizotropowe, które jest metodą polepszania jakości tekstur, gdy są one oglądane pod względnie dużymi kątami w stosunku do położenia kamery. Zazwyczaj sprawia, że wydają się mniej rozmyte przy większych odległościach." />
@@ -132,15 +140,7 @@
 				Rendering tekstur:
 			</text>
 			<!-- Removed in FIRE-24256, leaving it here for non-SL viewer version --> <check_box label="Pobieraj tekstury przez HTTP" tool_tip="Zaznacz tę opcję, aby ściągać tekstury poprzez protokół HTTP - odznacz ją, jeśli masz problemy z wyświetlaniem i chcesz wczytywać tekstury w taki sam sposób, jak przed lipcem 2010: na Viewerze 1." name="TexturesHTTP" />
-			<check_box width="270" label="Ogranicz maksymalną rozdzielczość tekstur do:" tool_tip="Zaznacz tą opcję, aby ograniczyć maksymalną rozdzielczość tekstur w świecie. Pozwala to na wyświetlanie większej ilości tekstur zanim dostępna na nie pamięć zostanie przekroczona i zaczną się one rozmywać." name="FSRestrictMaxTextureSize" />
-			<combo_box name="FSRestrictMaxTexturePixels">
-				<combo_box.item label="512 pikseli" name="512" />
-				<combo_box.item label="1024 pikseli" name="1024" />
-				<combo_box.item label="2048 pikseli" name="2048" />
-			</combo_box>
-			<text name="FSRestrictMaxTextureSizeRestartText">
-				(wymagany restart)
-			</text>
+			<check_box label="Ogranicz maksymalną rozdzielczość tekstur do 512px (tylko 64bit; wymagany restart)" tool_tip="Zaznacz tą opcję, aby ograniczyć maksymalną rozdzielczość tekstur w świecie. Pozwala to na wyświetlanie większej ilości tekstur zanim dostępna na nie pamięć zostanie przekroczona i zaczną się one rozmywać." name="FSRestrictMaxTextureSize" />
 			<text name="TextureDetailLabel">
 				Maks. jakość tekstur:
 			</text>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml b/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml
index e183096f0c..018e722d20 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml
@@ -116,6 +116,7 @@
 				<radio_item label="Odtwarzaj głos z pełną głośnością (tylko OpenSim)" name="2" />
 			</radio_group>
 			<check_box label="Poruszaj ustami awatara podczas mówienia" name="enable_lip_sync"/>
+			<check_box tool_tip="Zaznacz, aby włączyć usuwanie echa głosu" label="Usuwanie echa" name="enable_echo_cancellation" />
 			<check_box label="Pokazuj wskaźniki dźwięku ponad awatarami" tool_tip="Pokazuj wskaźniki dźwięku (białe kropki) ponad awatarami" name="FSShowVoiceVisualizer"/>
 			<check_box label="Pokazuj wskaźnik dźwięku ponad moim własnym awatarem" name="FSShowMyOwnVoiceVisualizer" />
 			<check_box label="Pokazuj wskaźniki dźwięku wraz z kropką" tool_tip="Jeśli ta opcja jest włączona, to kropka jest wyświetlana jako część wskaźników dźwięku. Jeśli jest wyłączona, to pokazują się tylko fale głosowe." name="FSShowVoiceVisualizerWithDot" />
@@ -124,7 +125,18 @@
 			<check_box label="Automatycznie odrzucaj zaproszenia grupowych rozmów głosowych" name="VoiceCallsRejectGroup"/>
 			<check_box label="Automatycznie odrzucaj zaproszenia AdHoc (konferencyjne) rozmów głosowych" name="VoiceCallsRejectAdHoc"/>
 			<check_box label="Automatycznie odrzucaj zaproszenia P2P (awatar z awatarem) rozmów głosowych" name="VoiceCallsRejectP2P"/>
-			<check_box label="Włącz/wyłącz mikrofon kiedy naciskam przycisk na pasku" name="push_to_talk_toggle_check" tool_tip="Kiedy aktywny jest tryb przełączania wciśnij i zwolnij przełącznik RAZ, aby włączyć lub wyłączyć mikrofon. Kiedy tryb przełączania nie jest aktywny mikrofon nadaje głos tylko wtedy, gdy przełącznik jest wciśnięty."/>
+			<check_box label="Włącz/wyłącz mikrofon przyciskiem na pasku" name="push_to_talk_toggle_check" tool_tip="Kiedy aktywny jest tryb przełączania wciśnij i zwolnij przełącznik RAZ, aby włączyć lub wyłączyć mikrofon. Kiedy tryb przełączania nie jest aktywny mikrofon nadaje głos tylko wtedy, gdy przełącznik jest wciśnięty."/>
+			<check_box tool_tip="Zaznacz, aby włączyć automatyczną regulację wzmocnienia" label="Automatyczna regulacja wzmocnienia" name="voice_automatic_gain_control" />
+			<text name="noise_suppression_label">
+				Tłumienie hałasu
+			</text>
+			<combo_box name="noise_suppression_combo">
+				<item label="Wyłączone" name="noise_suppression_none" />
+				<item label="Niskie" name="noise_suppression_low" />
+				<item label="Umiarkowane" name="noise_suppression_moderate" />
+				<item label="Wysokie" name="noise_suppression_high" />
+				<item label="Maksymalne" name="noise_suppression_max" />
+			</combo_box>
 			<button label="Ustawienia sprzętowe audio" name="device_settings_btn"/>
 			<panel label="Ustawienia sprzętowe" name="device_settings_panel">
 				<panel.string name="default_text">
diff --git a/indra/newview/skins/default/xui/pl/panel_region_terrain_texture_transform.xml b/indra/newview/skins/default/xui/pl/panel_region_terrain_texture_transform.xml
new file mode 100644
index 0000000000..12ec277276
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_region_terrain_texture_transform.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Teren" name="Terrain">
+	<text name="region_text">
+		brak danych
+	</text>
+	<text name="detail_texture_text">
+		Tekstury terenu
+	</text>
+	<text name="detail_material_text">
+		Materiały terenu
+	</text>
+	<check_box label="Chropowatość metaliczna PBR" name="terrain_material_type" tool_tip="Jeśli ta opcja jest zaznaczona, to użyj materiałów chropowatości metalicznej PBR dla terenu. W przeciwnym razie użyj tekstur." />
+	<text name="height_text_lbl">
+		1 (Nisko)
+	</text>
+	<text name="height_text_lbl4">
+		4 (Wysoko)
+	</text>
+	<layout_stack name="terrain_features_stack">
+		<layout_panel name="frame_settings_terrain">
+			<tab_container name="terrain_tabs">
+				<panel label="Wysokości" name="terrain_elevation_panel" />
+				<panel label="Przekształcenia" name="terrain_transform_panel" />
+			</tab_container>
+		</layout_panel>
+	</layout_stack>
+	<button label="Zastosuj" name="apply_btn" />
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_settings_terrain_elevation.xml b/indra/newview/skins/default/xui/pl/panel_settings_terrain_elevation.xml
new file mode 100644
index 0000000000..efe14c623b
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_settings_terrain_elevation.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Wysokości" name="panel_settings_terrain_elevation">
+	<spinner label="Poziom wody" name="water_height_spin" />
+	<spinner label="Górny limit terenu" name="terrain_raise_spin" />
+	<spinner label="Dolny limit terenu" name="terrain_lower_spin" />
+	<text name="height_text_lbl5">
+		Zakresy elewacyjne tekstur
+	</text>
+	<text name="height_text_lbl5_material">
+		Zakresy elewacyjne materiałów
+	</text>
+	<text name="height_text_lbl10">
+		Te wartości reprezentują zakres przenikania tekstur wyżej.
+	</text>
+	<text name="height_text_lbl10_material">
+		Te wartości reprezentują zakres przenikania materiałów wyżej.
+	</text>
+	<text name="height_text_lbl11">
+		Mierzone w metrach, wartość Nisko jest maksymalną wys. tekstury #1, a wartość Wysoko jest minimalną wys. tekstury #4.
+	</text>
+	<text name="height_text_lbl11_material">
+		Mierzone w metrach, wartość Nisko jest maksymalną wys. materiału #1, a wartość Wysoko jest minimalną wys. materiału #4.
+	</text>
+	<text name="height_text_lbl6">
+		Północny zach.
+	</text>
+	<text name="height_text_lbl7">
+		Północny wsch.
+	</text>
+	<spinner label="Nisko" name="height_start_spin_1" />
+	<spinner label="Nisko" name="height_start_spin_3" />
+	<spinner label="Wys." name="height_range_spin_1" />
+	<spinner label="Wys." name="height_range_spin_3" />
+	<text name="height_text_lbl8">
+		Południowy zach.
+	</text>
+	<text name="height_text_lbl9">
+		Południowy wsch.
+	</text>
+	<spinner label="Nisko" name="height_start_spin_0" />
+	<spinner label="Nisko" name="height_start_spin_2" />
+	<spinner label="Wys." name="height_range_spin_0" />
+	<spinner label="Wys." name="height_range_spin_2" />
+	<button label="Pobierz surowy teren..." name="download_raw_btn" tool_tip="Dostępne tylko dla właścicieli Majątku, nie dla zarządców" />
+	<button label="Prześlij surowy teren..." name="upload_raw_btn" tool_tip="Dostępne tylko dla właścicieli Majątku, nie dla zarządców" />
+	<button label="Ustal teren" name="bake_terrain_btn" tool_tip="(Bake Terrain) Zapamiętaj obecny teren jako punkt odniesienia dla limitów podnoszenia i opuszczania" />
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_settings_terrain_transform.xml b/indra/newview/skins/default/xui/pl/panel_settings_terrain_transform.xml
new file mode 100644
index 0000000000..c6ed3616f9
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_settings_terrain_transform.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Przekształcenia" name="panel_settings_terrain_transform">
+	<text name="terrain0ScaleU_label">
+		Skala u
+	</text>
+	<text name="terrain0ScaleV_label">
+		Skala v
+	</text>
+	<text name="terrain0Rotation_label">
+		Obrót
+	</text>
+	<text name="terrain0OffsetU_label">
+		Przesun. y
+	</text>
+	<text name="terrain0OffsetV_label">
+		Przesun. v
+	</text>
+</panel>

From 81cd344d6fbd6e91453ce01945fb4a321e3b5935 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Wed, 28 Aug 2024 01:00:47 +0200
Subject: [PATCH 03/28] Consolidate 'take' options in object context menu into
 their own sub-menu

---
 .../skins/default/xui/de/menu_object.xml      | 14 ++++---
 .../skins/default/xui/en/menu_object.xml      | 40 ++++++++++---------
 .../skins/default/xui/pl/menu_object.xml      | 14 ++++---
 .../skins/default/xui/ru/menu_object.xml      | 14 ++++---
 4 files changed, 46 insertions(+), 36 deletions(-)

diff --git a/indra/newview/skins/default/xui/de/menu_object.xml b/indra/newview/skins/default/xui/de/menu_object.xml
index 46c550c331..89b728e5f1 100644
--- a/indra/newview/skins/default/xui/de/menu_object.xml
+++ b/indra/newview/skins/default/xui/de/menu_object.xml
@@ -41,12 +41,14 @@
 	<menu_item_call label="Nicht anzeigen" name="Derender"/>
 	<menu_item_call label="Nicht anzeigen + Blacklist" name="DerenderPermanent"/>
 	<menu_item_call label="Zurückgeben" name="Return..."/>
-	<menu_item_call label="Nehmen" name="Pie Object Take"/>
-	<menu_item_call label="Kopie nehmen" name="Take Copy"/>
-	<menu_item_call label="Als kombiniertes Objekt nehmen" name="Take combined"/>
-	<menu_item_call label="Kopie als kombiniertes Objekt nehmen" name="Take Copy combined"/>
-	<menu_item_call label="Als separate Objekte nehmen" name="Take Separate"/>
-	<menu_item_call label="Kopien als separate Objekte nehmen" name="Take Copy Separate"/>
+	<context_menu label="Objekt nehmen" name="Take Submenu">
+		<menu_item_call label="Nehmen" name="Pie Object Take"/>
+		<menu_item_call label="Kopie nehmen" name="Take Copy"/>
+		<menu_item_call label="Als kombiniertes Objekt nehmen" name="Take combined"/>
+		<menu_item_call label="Kopie als kombiniertes Objekt nehmen" name="Take Copy combined"/>
+		<menu_item_call label="Als separate Objekte nehmen" name="Take Separate"/>
+		<menu_item_call label="Kopien als separate Objekte nehmen" name="Take Copy Separate"/>
+	</context_menu>
 	<menu_item_call label="Bezahlen" name="Pay..."/>
 	<menu_item_call label="Kaufen" name="Buy..."/>
 	<context_menu label="Speichern als" name="Export Menu">
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 0748989539..2124fc2deb 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -290,29 +290,32 @@
       <menu_item_call.on_enable
           function="Object.EnableReturn" />
     </menu_item_call>
-  <menu_item_call
+  <context_menu
+    label="Take object"
+    name="Take Submenu">
+    <menu_item_call
       label="Take"
       layout="topleft"
       name="Pie Object Take">
-    <menu_item_call.on_click
+      <menu_item_call.on_click
         function="Object.Take"/>
-    <menu_item_call.on_enable
+      <menu_item_call.on_enable
         function="Object.VisibleTake"/>
-    <menu_item_call.on_visible
+      <menu_item_call.on_visible
         function="Object.VisibleTakeSingle"/>
-  </menu_item_call>
-  <menu_item_call
+    </menu_item_call>
+    <menu_item_call
       enabled="false"
       label="Take copy"
       name="Take Copy">
-    <menu_item_call.on_click
+      <menu_item_call.on_click
         function="Tools.TakeCopy" />
-    <menu_item_call.on_enable
+      <menu_item_call.on_enable
         function="Tools.EnableTakeCopy" />
-    <menu_item_call.on_visible
+      <menu_item_call.on_visible
         function="Object.VisibleTakeSingle"/>
-  </menu_item_call>
-  <menu_item_call
+    </menu_item_call>
+    <menu_item_call
       label="Take as combined item"
       layout="topleft"
       name="Take combined">
@@ -322,8 +325,8 @@
         function="Object.VisibleTake"/>
       <menu_item_call.on_visible
         function="Object.VisibleTakeMultiple"/>
-  </menu_item_call>
-  <menu_item_call
+    </menu_item_call>
+    <menu_item_call
       enabled="false"
       label="Take copy as combined item"
       name="Take Copy combined">
@@ -333,8 +336,8 @@
         function="Tools.EnableTakeCopy" />
       <menu_item_call.on_visible
         function="Object.VisibleTakeMultiple"/>
-  </menu_item_call>
-  <menu_item_call
+    </menu_item_call>
+    <menu_item_call
       label="Take as separate items"
       layout="topleft"
       name="Take Separate">
@@ -344,8 +347,8 @@
         function="Object.EnableTakeMultiple"/>
       <menu_item_call.on_visible
         function="Object.VisibleTakeMultiple"/>
-  </menu_item_call>
-  <menu_item_call
+    </menu_item_call>
+    <menu_item_call
       label="Take copies as separate items"
       layout="topleft"
        name="Take Copy Separate">
@@ -355,7 +358,8 @@
         function="Tools.EnableCopySeparate"/>
        <menu_item_call.on_visible
         function="Object.VisibleTakeMultiple"/>
-  </menu_item_call>
+    </menu_item_call>
+  </context_menu>
   <menu_item_call
       enabled="false"
       label="Pay"
diff --git a/indra/newview/skins/default/xui/pl/menu_object.xml b/indra/newview/skins/default/xui/pl/menu_object.xml
index 5889ed223b..5350efdcdf 100644
--- a/indra/newview/skins/default/xui/pl/menu_object.xml
+++ b/indra/newview/skins/default/xui/pl/menu_object.xml
@@ -41,12 +41,14 @@
 	<menu_item_call label="Derenderuj" name="Derender"/>
 	<menu_item_call label="Derenderuj + czarna lista" name="DerenderPermanent"/>
 	<menu_item_call label="Zwróć" name="Return..."/>
-	<menu_item_call label="Weź" name="Pie Object Take"/>
-	<menu_item_call label="Weź kopię" name="Take Copy"/>
-	<menu_item_call label="Weź jako: podniesione razem" name="Take combined" />
-	<menu_item_call label="Weź kopię jako: podniesione razem" name="Take Copy combined" />
-	<menu_item_call label="Weź jako: oddzielne obiekty" name="Take Separate" />
-	<menu_item_call label="Weź kopie jako: oddzielne obiekty" name="Take Copy Separate" />
+	<context_menu label="Take object" name="Take Submenu">
+		<menu_item_call label="Weź" name="Pie Object Take"/>
+		<menu_item_call label="Weź kopię" name="Take Copy"/>
+		<menu_item_call label="Weź jako: podniesione razem" name="Take combined" />
+		<menu_item_call label="Weź kopię jako: podniesione razem" name="Take Copy combined" />
+		<menu_item_call label="Weź jako: oddzielne obiekty" name="Take Separate" />
+		<menu_item_call label="Weź kopie jako: oddzielne obiekty" name="Take Copy Separate" />
+	</context_menu>
 	<menu_item_call label="Zapłać" name="Pay..."/>
 	<menu_item_call label="Kup" name="Buy..."/>
 	<context_menu label="Zapisz jako" name="Export Menu">
diff --git a/indra/newview/skins/default/xui/ru/menu_object.xml b/indra/newview/skins/default/xui/ru/menu_object.xml
index 1cb506bfc6..067a6a4444 100644
--- a/indra/newview/skins/default/xui/ru/menu_object.xml
+++ b/indra/newview/skins/default/xui/ru/menu_object.xml
@@ -41,12 +41,14 @@
 	<menu_item_call label="Не отображать" name="Derender"/>
 	<menu_item_call label="Не отображать всегда" name="DerenderPermanent"/>
 	<menu_item_call label="Вернуть" name="Return..."/>
-	<menu_item_call label="Взять" name="Pie Object Take"/>
-	<menu_item_call label="Взять копию" name="Take Copy"/>
-	<menu_item_call label="Взять как комбинированный предмет" name="Take combined"/>
-	<menu_item_call label="Взять копию как комбинированный предмет" name="Take Copy combined"/>
-	<menu_item_call label="Взять как отдельные предметы" name="Take Separate"/>
-	<menu_item_call label="Взять копии как отдельные предметы" name="Take Copy Separate"/>
+	<context_menu label="Взять объект" name="Take Submenu">
+		<menu_item_call label="Взять" name="Pie Object Take"/>
+		<menu_item_call label="Взять копию" name="Take Copy"/>
+		<menu_item_call label="Взять как комбинированный предмет" name="Take combined"/>
+		<menu_item_call label="Взять копию как комбинированный предмет" name="Take Copy combined"/>
+		<menu_item_call label="Взять как отдельные предметы" name="Take Separate"/>
+		<menu_item_call label="Взять копии как отдельные предметы" name="Take Copy Separate"/>
+	</context_menu>
 	<menu_item_call label="Заплатить" name="Pay..."/>
 	<menu_item_call label="Купить" name="Buy..."/>
 	<context_menu label="Сохранить как" name="Export Menu">

From 67c6206a6c464581a063fd97d2af5eb4c1db60b7 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Wed, 28 Aug 2024 01:03:23 +0200
Subject: [PATCH 04/28] Minor Polish translation update...

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

diff --git a/indra/newview/skins/default/xui/pl/menu_object.xml b/indra/newview/skins/default/xui/pl/menu_object.xml
index 5350efdcdf..fd572e72b4 100644
--- a/indra/newview/skins/default/xui/pl/menu_object.xml
+++ b/indra/newview/skins/default/xui/pl/menu_object.xml
@@ -41,9 +41,9 @@
 	<menu_item_call label="Derenderuj" name="Derender"/>
 	<menu_item_call label="Derenderuj + czarna lista" name="DerenderPermanent"/>
 	<menu_item_call label="Zwróć" name="Return..."/>
-	<context_menu label="Take object" name="Take Submenu">
-		<menu_item_call label="Weź" name="Pie Object Take"/>
-		<menu_item_call label="Weź kopię" name="Take Copy"/>
+	<context_menu label="Weź obiekt" name="Take Submenu">
+		<menu_item_call label="Weź" name="Pie Object Take" />
+		<menu_item_call label="Weź kopię" name="Take Copy" />
 		<menu_item_call label="Weź jako: podniesione razem" name="Take combined" />
 		<menu_item_call label="Weź kopię jako: podniesione razem" name="Take Copy combined" />
 		<menu_item_call label="Weź jako: oddzielne obiekty" name="Take Separate" />

From 4fb84053e9486e6a83bd06c6aee86bcb1b46ef70 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Wed, 28 Aug 2024 01:07:46 +0200
Subject: [PATCH 05/28] Adding a separator, hopefully will help with
 readability

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

diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 2124fc2deb..3e8f09bfb4 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -315,6 +315,10 @@
       <menu_item_call.on_visible
         function="Object.VisibleTakeSingle"/>
     </menu_item_call>
+    <menu_item_separator>
+      <menu_item_separator.on_visible
+        function="Object.VisibleTakeMultiple" />
+    </menu_item_separator>
     <menu_item_call
       label="Take as combined item"
       layout="topleft"

From 60313bc9c3956192b9891bdb5967e0bc8268f841 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 28 Aug 2024 02:07:02 +0200
Subject: [PATCH 06/28] Add UI callback function registrations that somehow
 didn't make it during merge

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

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 51e9fa6283..9aaa34d03a 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -12894,6 +12894,9 @@ void initialize_menus()
     view_listener_t::addMenu(new LLEnableEditParticleSource(), "Object.EnableEditParticles");
 
     enable.add("Object.VisibleTake", boost::bind(&visible_take_object));
+    enable.add("Object.VisibleTakeMultiple", boost::bind(&is_multiple_selection));
+    enable.add("Object.VisibleTakeSingle", boost::bind(&is_single_selection));
+    enable.add("Object.EnableTakeMultiple", boost::bind(&enable_take_objects));
     enable.add("Object.VisibleBuy", boost::bind(&visible_buy_object));
 
     commit.add("Object.Buy", boost::bind(&handle_buy));

From 00788cb97fc1604dc1cff802aefce4964a2cc9b7 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 28 Aug 2024 10:27:20 +0200
Subject: [PATCH 07/28] FIRE-34403: Presumable fix for inventory loading on
 OpenSim

---
 indra/newview/llinventorymodelbackgroundfetch.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index f2169ab0de..0042e1c54e 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -389,14 +389,14 @@ void LLInventoryModelBackgroundFetch::scheduleFolderFetch(const LLUUID& cat_id,
             if (mForceFetchSet.find(cat_id) == mForceFetchSet.end())
             {
                 mForceFetchSet.insert(cat_id);
-                mFetchItemQueue.push_front(FetchQueueInfo(cat_id, FT_FORCED));
+                mFetchFolderQueue.emplace_front(FetchQueueInfo(cat_id, FT_FORCED));
             }
         }
         else
         {
             // Specific folder requests go to front of queue.
             // version presence acts as dupplicate prevention for normal fetches
-            mFetchItemQueue.push_front(FetchQueueInfo(cat_id, FT_DEFAULT));
+            mFetchFolderQueue.emplace_front(FetchQueueInfo(cat_id, FT_DEFAULT));
         }
 
         gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
@@ -414,13 +414,13 @@ void LLInventoryModelBackgroundFetch::scheduleItemFetch(const LLUUID& item_id, b
             if (mForceFetchSet.find(item_id) == mForceFetchSet.end())
             {
                 mForceFetchSet.insert(item_id);
-                mFetchItemQueue.push_front(FetchQueueInfo(item_id, FT_FORCED, false));
+                mFetchItemQueue.emplace_front(FetchQueueInfo(item_id, FT_FORCED, false));
             }
         }
         else
         {
             // 'isFinished' being set acts as dupplicate prevention for normal fetches
-            mFetchItemQueue.push_front(FetchQueueInfo(item_id, FT_DEFAULT, false));
+            mFetchItemQueue.emplace_front(FetchQueueInfo(item_id, FT_DEFAULT, false));
         }
 
         gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);

From 3f80edad2dd0975e46f2acbd730a924ce8273190 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Fri, 30 Aug 2024 00:58:38 +0200
Subject: [PATCH 08/28] Allow FS Badge in profiles to overwrite lifetime/beta
 ones, ensuring consistent team identification

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

diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index ae16c42844..226a521ea7 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -1459,6 +1459,12 @@ void LLPanelProfileSecondLife::fillAccountStatus(const LLAvatarData* avatar_data
         //childSetVisible("partner_spacer_layout", false);
         setBadge("Profile_Badge_Linden", "BadgeLinden");
     }
+    // <FS:Ansariel> Add Firestorm team badge
+    else if (FSData::getInstance()->getAgentFlags(avatar_data->avatar_id) != -1)
+    {
+        setBadge("Profile_Badge_Team", "BadgeTeam");
+    }
+    // </FS:Ansariel>
     else if (avatar_data->born_on < sl_release)
     {
         // <FS:Ansariel> Fix LL UI/UX design accident
@@ -1504,12 +1510,6 @@ void LLPanelProfileSecondLife::fillAccountStatus(const LLAvatarData* avatar_data
         //childSetVisible("partner_spacer_layout", false);
         setBadge("Profile_Badge_Pplus_Lifetime", "BadgePremiumPlusLifetime");
     }
-    // <FS:Ansariel> Add Firestorm team badge
-    else if (FSData::getInstance()->getAgentFlags(avatar_data->avatar_id) != -1)
-    {
-        setBadge("Profile_Badge_Team", "BadgeTeam");
-    }
-    // </FS:Ansariel>
     else
     {
         childSetVisible("badge_layout", false);

From 2cd6b1bcfe9790126d433192757a20ac31457718 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Fri, 30 Aug 2024 01:00:34 +0200
Subject: [PATCH 09/28] Revert "Adding a separator, hopefully will help with
 readability"

This reverts commit 4fb84053e9486e6a83bd06c6aee86bcb1b46ef70.
---
 indra/newview/skins/default/xui/en/menu_object.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 3e8f09bfb4..2124fc2deb 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -315,10 +315,6 @@
       <menu_item_call.on_visible
         function="Object.VisibleTakeSingle"/>
     </menu_item_call>
-    <menu_item_separator>
-      <menu_item_separator.on_visible
-        function="Object.VisibleTakeMultiple" />
-    </menu_item_separator>
     <menu_item_call
       label="Take as combined item"
       layout="topleft"

From c5896f3a5781b187c1a83670124b1eee681958e8 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Fri, 30 Aug 2024 16:26:21 +0200
Subject: [PATCH 10/28] Fiddle with Voice panel UI a little, streamline it a
 bit

---
 .../xui/de/panel_preferences_sound.xml        |  6 +-
 .../xui/en/panel_preferences_sound.xml        | 55 +++++++++----------
 .../xui/pl/panel_preferences_sound.xml        |  6 +-
 .../xui/ru/panel_preferences_sound.xml        |  4 +-
 4 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
index c739fbdb66..9cd43ebfcf 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
@@ -125,7 +125,6 @@
 			<radio_item label="Voice-Chat in der Nähe in gleicher Lautstärke hören (nur OpenSim)" name="2"/>
 		</radio_group>
 		<check_box label="Avatarlippen beim Sprechen bewegen" name="enable_lip_sync"/>
-		<check_box label="Echo-Unterdrückung" name="enable_echo_cancellation"/>
 		<check_box label="Zeige Voice-Indikator über Avataren" name="FSShowVoiceVisualizer" tool_tip="Wenn diese Option aktiviert ist, wird der Voice-Indikator (weißer Punkt) über Avataren angezeigt."/>
 		<check_box label="Zeige Voice-Indikator über eigenen Avatar" name="FSShowMyOwnVoiceVisualizer"/>
 		<check_box label="Zeige Voice-Indikator mit Punkt" name="FSShowVoiceVisualizerWithDot" tool_tip="Wenn diese Option aktiviert ist, wird der weiße Punkt im Voice-Indikator mit angezeigt. Falls deaktiviert, werden nur die Wellen-Symbole beim Sprechen angezeigt."/>
@@ -136,8 +135,9 @@
 		<check_box label="Automatisch alle eingehenden Privatanrufe abweisen" name="VoiceCallsRejectP2P"/>
 		<check_box label="Sprachfunktion beim Drücken des Buttons in der Symbolleiste ein-/ausschalten" name="push_to_talk_toggle_check" tool_tip="Wenn der Umschaltmodus aktiviert ist, drücken Sie die Auslöse-Taste EINMAL, um Ihr Mikrofon ein- oder auszuschalten. Wenn der Umschaltmodus nicht aktiviert ist, ist das Mikrofon nur dann eingeschaltet, wenn Sie die Auslösetaste gedrückt halten."/>
 		<check_box label="Automatische Verstärkungsregelung" name="voice_automatic_gain_control"/>
-		<text name="noise_suppression_label">
-			Rauschunterdrückung
+		<check_box label="Echo-Unterdrückung" name="enable_echo_cancellation"/>
+		<text name="noise_suppression_label" width="123">
+			Rauschunterdrückung:
 		</text>
 		<combo_box name="noise_suppression_combo">
 			<item label="Aus" name="noise_suppression_none"/>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 474d67bd1b..5a9da18d41 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -969,17 +969,6 @@
          layout="topleft"
          left="25"
          name="enable_lip_sync"
-         top_pad="5"
-         width="237"/>
-        <check_box
-         follows="top|left"
-         control_name="VoiceEchoCancellation"
-         height="15"
-         tool_tip="Check to enable voice echo cancellation"
-         label="Echo Cancellation"
-         layout="topleft"
-         left="25"
-         name="enable_echo_cancellation"
          top_pad="3"
          width="237"/>
         <check_box
@@ -992,7 +981,7 @@
          layout="topleft"
          left="25"
          name="FSShowVoiceVisualizer"
-         top_pad="3"
+         top_pad="2"
          width="237"/>
         <check_box
          enabled_control="EnableVoiceChat"
@@ -1003,7 +992,7 @@
          layout="topleft"
          left="35"
          name="FSShowMyOwnVoiceVisualizer"
-         top_pad="3"
+         top_pad="2"
          width="237"/>
         <check_box
          enabled_control="EnableVoiceChat"
@@ -1015,7 +1004,7 @@
          layout="topleft"
          left="35"
          name="FSShowVoiceVisualizerWithDot"
-         top_pad="3"
+         top_pad="2"
          width="237"/>
         <check_box
          enabled_control="EnableVoiceChat"
@@ -1039,7 +1028,7 @@
          layout="topleft"
          left="25"
          name="FSShowConversationVoiceStateIndicator"
-         top_pad="3"
+         top_pad="2"
          width="237"/>
 
         <check_box
@@ -1052,7 +1041,7 @@
          left="25"
          name="VoiceCallsRejectGroup"
          width="237"
-         top_pad="10"/>
+         top_pad="7"/>
         <check_box
          enabled_control="EnableVoiceChat"
          follows="left|top"
@@ -1063,7 +1052,7 @@
          left="25"
          name="VoiceCallsRejectAdHoc"
          width="237"
-         top_pad="3"/>
+         top_pad="2"/>
         <check_box
          enabled_control="EnableVoiceChat"
          follows="left|top"
@@ -1074,7 +1063,7 @@
          left="25"
          name="VoiceCallsRejectP2P"
          width="237"
-         top_pad="3"/>
+         top_pad="2"/>
 
         <check_box
          follows="top|left"
@@ -1087,7 +1076,7 @@
          name="push_to_talk_toggle_check"
          width="237"
          tool_tip="When in toggle mode, press and release the trigger key ONCE to switch your microphone on or off. When not in toggle mode, the microphone broadcasts your voice only while the trigger is being held down."
-         top_pad="10"/>
+         top_pad="7"/>
         <check_box
          follows="top|left"
          control_name="VoiceAutomaticGainControl"
@@ -1097,26 +1086,36 @@
          layout="topleft"
          name="voice_automatic_gain_control"
          left="25"
-         top_pad="6"
+         top_pad="2"
+         width="237"/>
+        <check_box
+         follows="top|left"
+         control_name="VoiceEchoCancellation"
+         height="15"
+         tool_tip="Check to enable voice echo cancellation"
+         label="Echo Cancellation"
+         layout="topleft"
+         left="25"
+         name="enable_echo_cancellation"
+         top_pad="2"
          width="237"/>
         <text
          follows="top|left"
          layout="topleft"
          height="15"
-         left_pad="25"
-         top_delta="-3"
-         width="120"
+         left="25"
+         top_pad="2"
+         width="105"
          name="noise_suppression_label">
-          Noise Suppression
+          Noise Suppression:
         </text>
         <combo_box
          control_name="VoiceNoiseSuppressionLevel"
          layout="topleft"
-         height="23"
-         left_pad="10"
-         top_pad="-18"
+         height="15"
+         left_pad="0"
          name="noise_suppression_combo"
-         width="100">
+         width="90">
           <item
            label="Off"
            name="noise_suppression_none"
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml b/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml
index 018e722d20..6c2c27d06a 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml
@@ -116,7 +116,6 @@
 				<radio_item label="Odtwarzaj głos z pełną głośnością (tylko OpenSim)" name="2" />
 			</radio_group>
 			<check_box label="Poruszaj ustami awatara podczas mówienia" name="enable_lip_sync"/>
-			<check_box tool_tip="Zaznacz, aby włączyć usuwanie echa głosu" label="Usuwanie echa" name="enable_echo_cancellation" />
 			<check_box label="Pokazuj wskaźniki dźwięku ponad awatarami" tool_tip="Pokazuj wskaźniki dźwięku (białe kropki) ponad awatarami" name="FSShowVoiceVisualizer"/>
 			<check_box label="Pokazuj wskaźnik dźwięku ponad moim własnym awatarem" name="FSShowMyOwnVoiceVisualizer" />
 			<check_box label="Pokazuj wskaźniki dźwięku wraz z kropką" tool_tip="Jeśli ta opcja jest włączona, to kropka jest wyświetlana jako część wskaźników dźwięku. Jeśli jest wyłączona, to pokazują się tylko fale głosowe." name="FSShowVoiceVisualizerWithDot" />
@@ -126,9 +125,10 @@
 			<check_box label="Automatycznie odrzucaj zaproszenia AdHoc (konferencyjne) rozmów głosowych" name="VoiceCallsRejectAdHoc"/>
 			<check_box label="Automatycznie odrzucaj zaproszenia P2P (awatar z awatarem) rozmów głosowych" name="VoiceCallsRejectP2P"/>
 			<check_box label="Włącz/wyłącz mikrofon przyciskiem na pasku" name="push_to_talk_toggle_check" tool_tip="Kiedy aktywny jest tryb przełączania wciśnij i zwolnij przełącznik RAZ, aby włączyć lub wyłączyć mikrofon. Kiedy tryb przełączania nie jest aktywny mikrofon nadaje głos tylko wtedy, gdy przełącznik jest wciśnięty."/>
+			<check_box tool_tip="Zaznacz, aby włączyć usuwanie echa głosu" label="Usuwanie echa" name="enable_echo_cancellation" />
 			<check_box tool_tip="Zaznacz, aby włączyć automatyczną regulację wzmocnienia" label="Automatyczna regulacja wzmocnienia" name="voice_automatic_gain_control" />
-			<text name="noise_suppression_label">
-				Tłumienie hałasu
+			<text name="noise_suppression_label" width="95">
+				Tłumienie hałasu:
 			</text>
 			<combo_box name="noise_suppression_combo">
 				<item label="Wyłączone" name="noise_suppression_none" />
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_sound.xml b/indra/newview/skins/default/xui/ru/panel_preferences_sound.xml
index 39a192a3ee..972b807d3e 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_sound.xml
@@ -111,7 +111,6 @@
 				<radio_item label="Слышать все голоса громко (только Open Sim)" name="2"/>
 			</radio_group>
 			<check_box label="Двигать губами аватара во время разговора" name="enable_lip_sync"/>
-			<check_box label="Подавление эха" name="enable_echo_cancellation" tool_tip="Установите флажок, чтобы включить подавление голосового эха"/>
 			<check_box label="Показать голосовой индикатор над аватарами" tool_tip="Показывает голосовой индикатор (белую точку) над аватарами" name="FSShowVoiceVisualizer"/>
 			<check_box label="Показать голосовой индикатор над моим аватаром" name="FSShowMyOwnVoiceVisualizer"/>
 			<check_box label="Показывать точку как часть голосового индикатора" tool_tip="Если этот параметр включен, точка отображается как часть голосового индикатора. Если отключено, отображаются только голосовые волны." name="FSShowVoiceVisualizerWithDot"/>
@@ -122,7 +121,8 @@
 			<check_box label="Автоматически отклонять все входящие P2P (аватар с аватаром) голосовые вызовы" name="VoiceCallsRejectP2P"/>
 			<check_box label="Включить/выключить микрофон при нажатии кнопки на панели инструментов" name="push_to_talk_toggle_check" tool_tip="В режиме 'Включить/выключить' микрофон включается и выключается одиночным нажатием кнопки. Иначе микрофон включен только когда нажата кнопка."/>
 			<check_box label="Автоматическая регулировка усиления" name="voice_automatic_gain_control" tool_tip="Установите флажок, чтобы включить автоматическую регулировку усиления"/>
-			<text name="noise_suppression_label" width="105" >Шумоподавление</text>
+			<check_box label="Подавление эха" name="enable_echo_cancellation" tool_tip="Установите флажок, чтобы включить подавление голосового эха"/>
+			<text name="noise_suppression_label">Шумоподавление:</text>
 			<combo_box name="noise_suppression_combo">
 				<item label="Выключено" name="noise_suppression_none"/>
 				<item label="Низкое" name="noise_suppression_low"/>

From d9fa45aec179c3a09ee67a8c007922e01fb56bc9 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Fri, 30 Aug 2024 16:42:56 +0200
Subject: [PATCH 11/28] FIRE-34455 Russian translation update, by Romka
 Swallowtail

---
 indra/newview/skins/default/xui/ru/menu_viewer.xml       | 6 ++++++
 indra/newview/skins/default/xui/ru/notifications.xml     | 5 +++++
 .../skins/default/xui/ru/panel_fs_performance_nearby.xml | 9 ++++++++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index 66866e7915..5bbbd960e0 100644
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -147,6 +147,7 @@
 		<menu label="Окружающая среда" name="Environment">
 			<menu_item_check label="Восход" name="Sunrise"/>
 			<menu_item_check label="Полдень" name="Noon"/>
+			<menu_item_check label="Полдень (устаревшее)" name="legacy noon"/>
 			<menu_item_check label="Закат" name="Sunset"/>
 			<menu_item_check label="Полночь" name="Midnight"/>
 			<menu_item_check label="Использовать Совместную Окружающую среду" name="Use Shared Environment"/>
@@ -196,6 +197,11 @@
 		<menu_item_call label="Проводник анимаций" name="Animation Explorer"/>
 		<menu_item_call label="Черный список активов" name="asset_blacklist"/>
 		<menu_item_call label="Настройки отображения аватаров" name="Avatar Render Settings"/>
+		<menu label="Отображение аватара" name="AvatarComplexityMode">
+			<menu_item_check label="Ограничение по сложности" name="complexity_limit_everone"/>
+			<menu_item_check label="Всегда показывать друзей" name="complexity_always_show_friends"/>
+			<menu_item_check label="Показывать только друзей" name="complexity_only_show_friends"/>
+		</menu>
 		<menu_item_check label="Показывать только друзей" name="Render Friends Only"/>
 	</menu>
 
diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml
index 7f0e17bc9f..e7a4c3479c 100644
--- a/indra/newview/skins/default/xui/ru/notifications.xml
+++ b/indra/newview/skins/default/xui/ru/notifications.xml
@@ -3640,6 +3640,11 @@ URL: [AUDIOURL]
 	<notification name="VoiceEffectsNew">
 		Появились новые типы изменения голоса!
 	</notification>
+	<notification name="VoiceEffectsNotSupported">
+Функция изменения голоса не поддерживается данным средством просмотра.
+Более подробную информацию о других инструментах для изменения голоса см. в [[FAQ_URL]этой статье].
+		<usetemplate name="okignore" ignoretext="Предупредить меня о том, что голосовая трансформация не поддерживается" yestext="OK"/>
+	</notification>
 	<notification name="Cannot enter parcel: not a group member">
 		Эту область могут посещать только участники определенной группы.
 	</notification>
diff --git a/indra/newview/skins/default/xui/ru/panel_fs_performance_nearby.xml b/indra/newview/skins/default/xui/ru/panel_fs_performance_nearby.xml
index d82785b813..8648bf7dff 100644
--- a/indra/newview/skins/default/xui/ru/panel_fs_performance_nearby.xml
+++ b/indra/newview/skins/default/xui/ru/panel_fs_performance_nearby.xml
@@ -20,7 +20,14 @@
 	<text name="av_nearby_desc3">
 		Примечание. Используйте вкладку Сложность аватара, чтобы видеть как вы влияете на других.
 	</text>
-	<check_box label="Всегда отображать друзей во всех подробностях" name="display_friends"/>
+	<text name="AvatarComplexityMode_Label" width="130">
+		Отображение аватара:
+	</text>
+	<combo_box name="AvatarComplexityMode">
+		<combo_box.item label="Ограничение по сложности" name="complexity_limit_everone"/>
+		<combo_box.item label="Всегда показывать друзей" name="complexity_always_show_friends"/>
+		<combo_box.item label="Показывать только друзей" name="complexity_only_show_friends"/>
+	</combo_box>
 	<button label="Исключения..." name="exceptions_btn"/>
 	<check_box label="Полностью скрыть аватары" name="hide_avatars"/>
 	<text name="name_tags_textbox">Бейджи:</text>

From 1e36a206486b4b645e5ef2c7609e48a5a9d19f76 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sat, 31 Aug 2024 00:33:28 +0200
Subject: [PATCH 12/28] FIRE-34403: More OpenSim inventory fixes

---
 indra/newview/llinventorymodelbackgroundfetch.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 0042e1c54e..a8d7143f93 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -1297,7 +1297,11 @@ void LLInventoryModelBackgroundFetch::bulkFetch()
                             folder_count++;
                         }
                     }
+#ifdef OPENSIM
+                    if (LLViewerInventoryCategory::VERSION_UNKNOWN != cat->getVersion() || !LLGridManager::getInstance()->isInSecondLife())
+#else
                     else
+#endif
                     {
                         // May already have this folder, but append child folders to list.
                         if (fetch_info.mFetchType >= FT_CONTENT_RECURSIVE)

From dab786ff456ff3e81551e6868008128e4935eb8f Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Sun, 1 Sep 2024 13:59:15 +0100
Subject: [PATCH 13/28] FIRE-34189 - Fix for Vignette behaviour is wrong.

FIX remove unwanted screen_res divisor
The vertex shader already normalises the vary_fragcoord to be (0..1)
---
 .../newview/app_settings/shaders/class1/post/exoVignetteF.glsl  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/shaders/class1/post/exoVignetteF.glsl b/indra/newview/app_settings/shaders/class1/post/exoVignetteF.glsl
index 1786e0c012..7b17cde7c2 100644
--- a/indra/newview/app_settings/shaders/class1/post/exoVignetteF.glsl
+++ b/indra/newview/app_settings/shaders/class1/post/exoVignetteF.glsl
@@ -18,7 +18,7 @@ in vec2 vary_fragcoord;
 void main ()
 {
     vec4 diff = texture(diffuseRect, vary_fragcoord.xy);
-    vec2 tc = vary_fragcoord / screen_res - 0.5f;
+    vec2 tc = vary_fragcoord - 0.5f;
     float vignette_val = 1 - dot(tc, tc);
     diff.rgb *= clamp(pow(mix(1, vignette_val * vignette_val * vignette_val * vignette_val * vignette.z, vignette.x), vignette.y), 0, 1);
     frag_color = diff;

From f186f3f1d18d105938ae6f071ec03b3122228445 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Sun, 1 Sep 2024 22:01:33 +0100
Subject: [PATCH 14/28] Exploring bugsplat symbol auto-upload.

---
 .github/workflows/build_viewer.yml | 88 ++++++++++++++++++------------
 1 file changed, 54 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/build_viewer.yml b/.github/workflows/build_viewer.yml
index 040155945c..e928ab33ca 100644
--- a/.github/workflows/build_viewer.yml
+++ b/.github/workflows/build_viewer.yml
@@ -37,6 +37,8 @@ jobs:
     outputs:
       viewer_channel: ${{ steps.channel.outputs.viewer_channel }}
       viewer_version: ${{ steps.version.outputs.viewer_version }}
+      viewer_build: ${{ steps.version.outputs.viewer_build }}
+      viewer_release_type: ${{ steps.version.outputs.viewer_release_type }}
     steps:
       - name: Install Bash 4 and GNU sed on Mac
         if: runner.os == 'macOS'
@@ -289,15 +291,58 @@ jobs:
         id: build
         run: autobuild build -c ReleaseFS -A${{matrix.addrsize}} --no-configure
         shell: bash
-      # - name: Extract version number
-      #   id: version
-      #   shell: bash
-      #   run: |
-      #     if [ -r "indra/newview/viewer_version.txt" ]
-      #     then
-      #         viewer_version="$(<"$build_dir/newview/viewer_version.txt")"
-      #         echo "viewer_version=$viewer_version" >> "$GITHUB_OUTPUT"
-      #     fi
+      - name: Extract version number
+        id: version
+        shell: bash
+        run: |
+          if [ -r "indra/newview/viewer_version.txt" ]
+          then
+              viewer_version="$(<"indra/newview/viewer_version.txt")"
+              echo "viewer_version=$viewer_version" >> "$GITHUB_OUTPUT"
+          fi
+          viewer_build=$(git rev-list --count HEAD)
+          echo "viewer_build=$viewer_build" >> "$GITHUB_OUTPUT"
+          echo "viewer_channel=${{ env.FS_RELEASE_CHAN }}" >> "$GITHUB_OUTPUT"
+          echo "viewer_release_type=${{ env.FS_RELEASE_TYPE }}" >> "$GITHUB_OUTPUT"
+      - name: Post Release Symbols (windows)
+        if: runner.os == 'Windows'
+        uses: BugSplat-Git/symbol-upload@main
+        with:
+          clientId: "${{ secrets.BUGSPLAT_CLIENT_ID }}"
+          clientSecret: "${{ secrets.BUGSPLAT_CLIENT_SECRET }}"
+          database: ${{ steps.version.viewer_release_type == 'Release' && secrets.BUGSPLAT_RELEASE_DB || secrets.BUGSPLAT_PREVIEW_DB }}
+          application: "Firestorm-${{ steps.version.outputs.viewer_channel}}"
+          version: ${{ steps.version.outputs.viewer_version }}
+          files: "**/*.{pdb,exe,dll}"
+          directory: "build-*"
+          node-version: "20"
+
+      - name: Post Release Symbols (macOS)
+        if: runner.os == 'macOS'
+        uses: BugSplat-Git/symbol-upload@main
+        with:
+          clientId: "${{ secrets.BUGSPLAT_CLIENT_ID }}"
+          clientSecret: "${{ secrets.BUGSPLAT_CLIENT_SECRET }}"
+          database: ${{ steps.version.viewer_release_type == 'Release' && secrets.BUGSPLAT_RELEASE_DB || secrets.BUGSPLAT_PREVIEW_DB }}
+          application: "Firestorm-${{ steps.version.outputs.viewer_channel}}"
+          version: ${{ steps.version.outputs.viewer_version }}
+          files: "**/*"
+          directory: "build-*"
+          node-version: "20"
+      - name: Post Release Symbols (linux)
+        if: runner.os == 'Linux'
+        uses: BugSplat-Git/symbol-upload@main
+        with:
+          clientId: "${{ secrets.BUGSPLAT_CLIENT_ID }}"
+          clientSecret: "${{ secrets.BUGSPLAT_CLIENT_SECRET }}"
+          database: ${{ steps.version.viewer_release_type == 'Release' && secrets.BUGSPLAT_RELEASE_DB || secrets.BUGSPLAT_PREVIEW_DB }}
+          application: "Firestorm-${{ steps.version.outputs.viewer_channel}}"
+          version: ${{ steps.version.outputs.viewer_version }}
+          files: "**/*"
+          directory: "build-*"
+          dumpSyms: true
+          node-version: "20"
+  
       - name: Publish artifacts
         if: runner.os == 'Windows'
         uses: actions/upload-artifact@v4
@@ -324,31 +369,6 @@ jobs:
           path: |
             build-darwin-*/newview/*.dmg
             build-darwin-*/newview/*.bz2
-  # post-windows-symbols:
-  #   needs: build_matrix
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: Post Windows symbols
-  #       uses: secondlife/viewer-build-util/post-bugsplat-windows@v1
-  #       with:
-  #         username: ${{ secrets.BUGSPLAT_USER }}
-  #         password: ${{ secrets.BUGSPLAT_PASS }}
-  #         database: "firestorm_release"
-  #         channel: ${{ needs.build_matrix.outputs.viewer_channel }}
-  #         version: ${{ needs.build_matrix.outputs.viewer_version }}
-          
-  # post-mac-symbols:
-  #   needs: build_matrix
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: Post Mac symbols
-  #       uses: secondlife/viewer-build-util/post-bugsplat-mac@v1
-  #       with:
-  #         username: ${{ secrets.BUGSPLAT_USER }}
-  #         password: ${{ secrets.BUGSPLAT_PASS }}
-  #         database: "firestorm_release"
-  #         channel: ${{ needs.build_matrix.outputs.viewer_channel }}
-  #         version: ${{ needs.build_matrix.outputs.viewer_version }}
   deploy:
     runs-on: ubuntu-latest
     needs: build_matrix

From c9f773b25c33e9e9daff9cbeb342845bcf589481 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Mon, 2 Sep 2024 12:09:01 +0100
Subject: [PATCH 15/28] Tweak BugSplat submission recipe

Different builds ahave different secrets
Unify rules for x-platform to reduce duplication.
---
 .github/workflows/build_viewer.yml | 38 +++++-------------------------
 1 file changed, 6 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/build_viewer.yml b/.github/workflows/build_viewer.yml
index e928ab33ca..d97caef5ec 100644
--- a/.github/workflows/build_viewer.yml
+++ b/.github/workflows/build_viewer.yml
@@ -304,44 +304,18 @@ jobs:
           echo "viewer_build=$viewer_build" >> "$GITHUB_OUTPUT"
           echo "viewer_channel=${{ env.FS_RELEASE_CHAN }}" >> "$GITHUB_OUTPUT"
           echo "viewer_release_type=${{ env.FS_RELEASE_TYPE }}" >> "$GITHUB_OUTPUT"
-      - name: Post Release Symbols (windows)
-        if: runner.os == 'Windows'
+      - name: Post Bugsplat Symbols
         uses: BugSplat-Git/symbol-upload@main
         with:
-          clientId: "${{ secrets.BUGSPLAT_CLIENT_ID }}"
-          clientSecret: "${{ secrets.BUGSPLAT_CLIENT_SECRET }}"
+          clientId: ${{ steps.version.viewer_release_type == 'Release' && secrets.BUGSPLAT_RELEASE_ID || secrets.BUGSPLAT_PREVIEW_ID }}
+          clientSecret: ${{ steps.version.viewer_release_type == 'Release' && secrets.BUGSPLAT_RELEASE_SECRET || secrets.BUGSPLAT_PREVIEW_SECRET }}
           database: ${{ steps.version.viewer_release_type == 'Release' && secrets.BUGSPLAT_RELEASE_DB || secrets.BUGSPLAT_PREVIEW_DB }}
           application: "Firestorm-${{ steps.version.outputs.viewer_channel}}"
-          version: ${{ steps.version.outputs.viewer_version }}
-          files: "**/*.{pdb,exe,dll}"
+          version: ${{ steps.version.outputs.viewer_version }}.${{ steps.version.outputs.viewer_build }}
+          files: ${{ runner.os == 'Windows' && '**/*.{pdb,exe,dll}' || '**/*' }}
           directory: "build-*"
           node-version: "20"
-
-      - name: Post Release Symbols (macOS)
-        if: runner.os == 'macOS'
-        uses: BugSplat-Git/symbol-upload@main
-        with:
-          clientId: "${{ secrets.BUGSPLAT_CLIENT_ID }}"
-          clientSecret: "${{ secrets.BUGSPLAT_CLIENT_SECRET }}"
-          database: ${{ steps.version.viewer_release_type == 'Release' && secrets.BUGSPLAT_RELEASE_DB || secrets.BUGSPLAT_PREVIEW_DB }}
-          application: "Firestorm-${{ steps.version.outputs.viewer_channel}}"
-          version: ${{ steps.version.outputs.viewer_version }}
-          files: "**/*"
-          directory: "build-*"
-          node-version: "20"
-      - name: Post Release Symbols (linux)
-        if: runner.os == 'Linux'
-        uses: BugSplat-Git/symbol-upload@main
-        with:
-          clientId: "${{ secrets.BUGSPLAT_CLIENT_ID }}"
-          clientSecret: "${{ secrets.BUGSPLAT_CLIENT_SECRET }}"
-          database: ${{ steps.version.viewer_release_type == 'Release' && secrets.BUGSPLAT_RELEASE_DB || secrets.BUGSPLAT_PREVIEW_DB }}
-          application: "Firestorm-${{ steps.version.outputs.viewer_channel}}"
-          version: ${{ steps.version.outputs.viewer_version }}
-          files: "**/*"
-          directory: "build-*"
-          dumpSyms: true
-          node-version: "20"
+          dumpSyms: ${{ runner.os == 'Linux' && 'true' || 'false' }}
   
       - name: Publish artifacts
         if: runner.os == 'Windows'

From aeb146f269d1692b65ae141d373c3f5fd2029a1e Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Mon, 2 Sep 2024 15:38:08 +0100
Subject: [PATCH 16/28] optimise the file specs. also use beq fork to enable
 dumpSyms

---
 .github/workflows/build_viewer.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_viewer.yml b/.github/workflows/build_viewer.yml
index d97caef5ec..6ebbf84442 100644
--- a/.github/workflows/build_viewer.yml
+++ b/.github/workflows/build_viewer.yml
@@ -305,14 +305,14 @@ jobs:
           echo "viewer_channel=${{ env.FS_RELEASE_CHAN }}" >> "$GITHUB_OUTPUT"
           echo "viewer_release_type=${{ env.FS_RELEASE_TYPE }}" >> "$GITHUB_OUTPUT"
       - name: Post Bugsplat Symbols
-        uses: BugSplat-Git/symbol-upload@main
+        uses: beqjanus/symbol-upload@main
         with:
           clientId: ${{ steps.version.viewer_release_type == 'Release' && secrets.BUGSPLAT_RELEASE_ID || secrets.BUGSPLAT_PREVIEW_ID }}
           clientSecret: ${{ steps.version.viewer_release_type == 'Release' && secrets.BUGSPLAT_RELEASE_SECRET || secrets.BUGSPLAT_PREVIEW_SECRET }}
           database: ${{ steps.version.viewer_release_type == 'Release' && secrets.BUGSPLAT_RELEASE_DB || secrets.BUGSPLAT_PREVIEW_DB }}
           application: "Firestorm-${{ steps.version.outputs.viewer_channel}}"
           version: ${{ steps.version.outputs.viewer_version }}.${{ steps.version.outputs.viewer_build }}
-          files: ${{ runner.os == 'Windows' && '**/*.{pdb,exe,dll}' || '**/*' }}
+          files: ${{ runner.os == 'Windows' && '**/*.{pdb,exe,dll}' || runner.os == 'macOS' && '**/*.xcarchive.zip' || '**/{do-not-run-directly-firestorm-bin,*.sym}' }}
           directory: "build-*"
           node-version: "20"
           dumpSyms: ${{ runner.os == 'Linux' && 'true' || 'false' }}

From acae30fd287209583c745a6c88b8ca90e12e8e59 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Mon, 2 Sep 2024 17:39:41 +0100
Subject: [PATCH 17/28] Added node-dump-syms installation for Linux

In the GitHub workflow, a step has been added to install node-dump-syms when the runner OS is Linux. Also, the file path for Windows in Post Bugsplat Symbols has been updated to specifically target Release files.
---
 .github/workflows/build_viewer.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build_viewer.yml b/.github/workflows/build_viewer.yml
index 6ebbf84442..f8f01b170e 100644
--- a/.github/workflows/build_viewer.yml
+++ b/.github/workflows/build_viewer.yml
@@ -304,6 +304,9 @@ jobs:
           echo "viewer_build=$viewer_build" >> "$GITHUB_OUTPUT"
           echo "viewer_channel=${{ env.FS_RELEASE_CHAN }}" >> "$GITHUB_OUTPUT"
           echo "viewer_release_type=${{ env.FS_RELEASE_TYPE }}" >> "$GITHUB_OUTPUT"
+      - name: Install node-dump-syms
+        if: runner.os == 'Linux'
+        run: npm install -g @bugsplat/node-dump-syms          
       - name: Post Bugsplat Symbols
         uses: beqjanus/symbol-upload@main
         with:
@@ -312,7 +315,7 @@ jobs:
           database: ${{ steps.version.viewer_release_type == 'Release' && secrets.BUGSPLAT_RELEASE_DB || secrets.BUGSPLAT_PREVIEW_DB }}
           application: "Firestorm-${{ steps.version.outputs.viewer_channel}}"
           version: ${{ steps.version.outputs.viewer_version }}.${{ steps.version.outputs.viewer_build }}
-          files: ${{ runner.os == 'Windows' && '**/*.{pdb,exe,dll}' || runner.os == 'macOS' && '**/*.xcarchive.zip' || '**/{do-not-run-directly-firestorm-bin,*.sym}' }}
+          files: ${{ runner.os == 'Windows' && '**/Release/*.{pdb,exe,dll}' || runner.os == 'macOS' && '**/*.xcarchive.zip' || '**/{do-not-run-directly-firestorm-bin,*.sym}' }}
           directory: "build-*"
           node-version: "20"
           dumpSyms: ${{ runner.os == 'Linux' && 'true' || 'false' }}

From 2b593e7e74feca8b69cc3351d0fa52a57e45c046 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Mon, 2 Sep 2024 19:56:59 +0100
Subject: [PATCH 18/28] Allow (try at least) to enable bugsplat on Mac

---
 scripts/configure_firestorm.sh | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/scripts/configure_firestorm.sh b/scripts/configure_firestorm.sh
index 9cab69753d..73ebcfe17d 100755
--- a/scripts/configure_firestorm.sh
+++ b/scripts/configure_firestorm.sh
@@ -309,15 +309,6 @@ if [ ! -d `dirname "$LOG"` ] ; then
         mkdir -p `dirname "$LOG"`
 fi
 
-if [ $TARGET_PLATFORM == "darwin" ]
-then
-	if [ $WANTS_CRASHREPORTING -eq $TRUE ]
-	then
-		echo "--crashreporting is not supported on this platform"
-		WANTS_CRASHREPORTING=$FALSE
-	fi
-fi
-
 echo -e "configure_firestorm.sh" > $LOG
 echo -e "       PLATFORM: $TARGET_PLATFORM"                                    | tee -a $LOG
 echo -e "            KDU: `b2a $WANTS_KDU`"                                    | tee -a $LOG

From 46677f38775338da785f9bfe3064e5285a06664b Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Tue, 3 Sep 2024 00:06:10 +0100
Subject: [PATCH 19/28] Updated workflow for symbol upload

The GitHub Actions workflow has been updated to handle different types of releases. The changes include:
- Replaced the package in the node-dump-syms installation step.
- Expanded the conditions for setting clientId, clientSecret, and database based on viewer_release_type.
- Added support for 'Nightly', 'Manual', 'Beta', and 'Alpha' release types besides the existing 'Release'.
- Default secrets are used if none of the conditions match.
---
 .github/workflows/build_viewer.yml | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build_viewer.yml b/.github/workflows/build_viewer.yml
index f8f01b170e..e2ff00bd6f 100644
--- a/.github/workflows/build_viewer.yml
+++ b/.github/workflows/build_viewer.yml
@@ -306,20 +306,37 @@ jobs:
           echo "viewer_release_type=${{ env.FS_RELEASE_TYPE }}" >> "$GITHUB_OUTPUT"
       - name: Install node-dump-syms
         if: runner.os == 'Linux'
-        run: npm install -g @bugsplat/node-dump-syms          
+        run: npm install -g node-dump-syms          
       - name: Post Bugsplat Symbols
         uses: beqjanus/symbol-upload@main
         with:
-          clientId: ${{ steps.version.viewer_release_type == 'Release' && secrets.BUGSPLAT_RELEASE_ID || secrets.BUGSPLAT_PREVIEW_ID }}
-          clientSecret: ${{ steps.version.viewer_release_type == 'Release' && secrets.BUGSPLAT_RELEASE_SECRET || secrets.BUGSPLAT_PREVIEW_SECRET }}
-          database: ${{ steps.version.viewer_release_type == 'Release' && secrets.BUGSPLAT_RELEASE_DB || secrets.BUGSPLAT_PREVIEW_DB }}
+          clientId: ${{ 
+            steps.version.outputs.viewer_release_type == 'Release' && secrets.BUGSPLAT_RELEASE_ID || 
+            steps.version.outputs.viewer_release_type == 'Nightly' && secrets.BUGSPLAT_NIGHTLY_ID || 
+            steps.version.outputs.viewer_release_type == 'Manual' && secrets.BUGSPLAT_MANUAL_ID || 
+            steps.version.outputs.viewer_release_type == 'Beta' && secrets.BUGSPLAT_PREVIEW_ID || 
+            steps.version.outputs.viewer_release_type == 'Alpha' && secrets.BUGSPLAT_ALPHA_ID || 
+            secrets.BUGSPLAT_DEFAULT_ID }}
+          clientSecret: ${{ 
+            steps.version.outputs.viewer_release_type == 'Release' && secrets.BUGSPLAT_RELEASE_SECRET || 
+            steps.version.outputs.viewer_release_type == 'Nightly' && secrets.BUGSPLAT_NIGHTLY_SECRET || 
+            steps.version.outputs.viewer_release_type == 'Manual' && secrets.BUGSPLAT_MANUAL_SECRET || 
+            steps.version.outputs.viewer_release_type == 'Beta' && secrets.BUGSPLAT_PREVIEW_SECRET || 
+            steps.version.outputs.viewer_release_type == 'Alpha' && secrets.BUGSPLAT_ALPHA_SECRET || 
+            secrets.BUGSPLAT_DEFAULT_SECRET }}
+          database: ${{ 
+            steps.version.outputs.viewer_release_type == 'Release' && secrets.BUGSPLAT_RELEASE_DB || 
+            steps.version.outputs.viewer_release_type == 'Nightly' && secrets.BUGSPLAT_NIGHTLY_DB || 
+            steps.version.outputs.viewer_release_type == 'Manual' && secrets.BUGSPLAT_MANUAL_DB || 
+            steps.version.outputs.viewer_release_type == 'Beta' && secrets.BUGSPLAT_PREVIEW_DB || 
+            steps.version.outputs.viewer_release_type == 'Alpha' && secrets.BUGSPLAT_ALPHA_DB || 
+            secrets.BUGSPLAT_DEFAULT_DB }}
           application: "Firestorm-${{ steps.version.outputs.viewer_channel}}"
           version: ${{ steps.version.outputs.viewer_version }}.${{ steps.version.outputs.viewer_build }}
           files: ${{ runner.os == 'Windows' && '**/Release/*.{pdb,exe,dll}' || runner.os == 'macOS' && '**/*.xcarchive.zip' || '**/{do-not-run-directly-firestorm-bin,*.sym}' }}
           directory: "build-*"
           node-version: "20"
           dumpSyms: ${{ runner.os == 'Linux' && 'true' || 'false' }}
-  
       - name: Publish artifacts
         if: runner.os == 'Windows'
         uses: actions/upload-artifact@v4

From 85b07d8817340632d4222985762afc40482f8131 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Tue, 3 Sep 2024 13:43:06 +0100
Subject: [PATCH 20/28] Updated npm packages in GitHub workflow

npm dump-syms installation can fallback to source building. This has a dependency on pre-gyp to grab cargo.
---
 .github/workflows/build_viewer.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build_viewer.yml b/.github/workflows/build_viewer.yml
index e2ff00bd6f..e400cc0ddc 100644
--- a/.github/workflows/build_viewer.yml
+++ b/.github/workflows/build_viewer.yml
@@ -306,7 +306,9 @@ jobs:
           echo "viewer_release_type=${{ env.FS_RELEASE_TYPE }}" >> "$GITHUB_OUTPUT"
       - name: Install node-dump-syms
         if: runner.os == 'Linux'
-        run: npm install -g node-dump-syms          
+        run: |
+          npm install -g node-pre-gyp          
+          npm install -g node-dump-syms          
       - name: Post Bugsplat Symbols
         uses: beqjanus/symbol-upload@main
         with:

From 6b2e9ffb7760bd03561049afdb38b583d1c49887 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Tue, 3 Sep 2024 16:15:58 +0100
Subject: [PATCH 21/28] Linux needs pwsh for the dump-syms...

We'll see if installing ti works before we resort to cloning the action and rewriting it to bash
---
 .github/workflows/build_viewer.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.github/workflows/build_viewer.yml b/.github/workflows/build_viewer.yml
index e400cc0ddc..579566361c 100644
--- a/.github/workflows/build_viewer.yml
+++ b/.github/workflows/build_viewer.yml
@@ -203,8 +203,19 @@ jobs:
           dependencies=("python3-setuptools" "mesa-common-dev" "libgl1-mesa-dev" "libxinerama-dev" "libxrandr-dev" "libpulse-dev" "libglu1-mesa-dev" "libfreetype6-dev" "libfontconfig1")
           sudo apt-get update
           sudo apt-get install -y "${dependencies[@]}"
+          sudo apt-get install -y wget apt-transport-https software-properties-common
           sudo apt-get autoremove --purge 
           sudo apt-get clean
+        
+      - name: Install Microsoft repository GPG keys
+        if: runner.os == 'Linux'
+        run: |
+          wget -q "https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/packages-microsoft-prod.deb" -O packages-microsoft-prod.deb
+          sudo dpkg -i packages-microsoft-prod.deb
+          rm packages-microsoft-prod.deb
+          sudo apt-get update
+          sudo apt-get install -y powershell
+          pwsh -c '$PSVersionTable'
 
       - name: test macOS bundles are present
         if: runner.os == 'MacOS'
@@ -309,6 +320,7 @@ jobs:
         run: |
           npm install -g node-pre-gyp          
           npm install -g node-dump-syms          
+
       - name: Post Bugsplat Symbols
         uses: beqjanus/symbol-upload@main
         with:

From b517e94471342d65d5103695062c95c511726c59 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Tue, 3 Sep 2024 21:21:58 +0200
Subject: [PATCH 22/28] FIRE-34471 French translation update, by Laurent Bechir

---
 .../default/xui/fr/menu_nearby_media.xml      |  5 ++
 .../xui/fr/panel_preferences_sound.xml        | 19 +++++--
 ...panel_region_terrain_texture_transform.xml | 31 ++++++++++
 .../fr/panel_settings_terrain_elevation.xml   | 56 +++++++++++++++++++
 .../fr/panel_settings_terrain_transform.xml   | 23 ++++++++
 5 files changed, 129 insertions(+), 5 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/fr/menu_nearby_media.xml
 create mode 100644 indra/newview/skins/default/xui/fr/panel_region_terrain_texture_transform.xml
 create mode 100644 indra/newview/skins/default/xui/fr/panel_settings_terrain_elevation.xml
 create mode 100644 indra/newview/skins/default/xui/fr/panel_settings_terrain_transform.xml

diff --git a/indra/newview/skins/default/xui/fr/menu_nearby_media.xml b/indra/newview/skins/default/xui/fr/menu_nearby_media.xml
new file mode 100644
index 0000000000..17eee415d6
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_nearby_media.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_nearby_media">
+	<menu_item_call label="Copier l'Url" name="copy_url"/>
+	<menu_item_call label="Copier les données" name="copy_data"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
index 7d62d22294..6c91d1fdb6 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
@@ -75,6 +75,7 @@
 			<radio_group name="ear_location">
 				<radio_item label="Entendre à partir de la position de la caméra" name="0"/>
 				<radio_item label="Entendre à partir de la position de l'avatar" name="1"/>
+				<radio_item label="Entendre les voix proches à plein volume (Open Sim uniquement)" name="2"/>
 			</radio_group>
 			<check_box label="Bouger les lèvres de l'avatar lorsque je parle" name="enable_lip_sync"/>
 			<check_box label="Afficher les indicateurs de voix au-dessus des avatars" tool_tip="Afficher un indicateur signifiant un chat vocal actif au-dessus des avatars" name="FSShowVoiceVisualizer"/>
@@ -86,12 +87,20 @@
 			<check_box label="Refuser automatiquement toute conférence vocale" name="VoiceCallsRejectAdHoc"/>
 			<check_box label="Refuser automatiquement tout appel vocal d'avatar à avatar" name="VoiceCallsRejectP2P"/>
 			<check_box label="Parler en appuyant sur la touche :" name="push_to_talk_toggle_check" tool_tip="Activer cette option activera le micro uniquement après avoir appuyé sur la touche correspondante. Pour redevenir silencieux, il suffit d'appuyer à nouveau sur la touche. Si l'option est désactivée, "/>
-			<line_editor name="modifier_combo" label="Activer le Push-to-talk"/>
-			<button label="Définir la touche" name="set_voice_hotkey_button"/>
-			<button tool_tip="Effacer la touche" name="clear_voice_hotkey_button"/>
-			<button tool_tip="Réinitialiser au clic molette" name="set_voice_middlemouse_button"/>
+			<check_box tool_tip="Contrôle automatique du gain" label="Contrôle automatique du gain" name="voice_automatic_gain_control"/>
+			<check_box tool_tip="Suppression de l'écho" label="Suppression de l'écho" name="enable_echo_cancellation"/>
+			<text name="noise_suppression_label">
+				Réduction du bruit :
+			</text>
+			<combo_box name="noise_suppression_combo">
+				<item label="Désactivée" name="noise_suppression_none"/>
+				<item label="Basse" name="noise_suppression_low"/>
+				<item label="Modérée" name="noise_suppression_moderate"/>
+				<item label="Haute" name="noise_suppression_high"/>
+				<item label="Max" name="noise_suppression_max"/>
+			</combo_box>
 			<button label="Paramètres Matériel audio" name="device_settings_btn"/>
-			<panel label="Device Settings" name="device_settings_panel">
+			<panel label="Paramètres des appareils" name="device_settings_panel">
 				<panel.string name="default_text">Par défaut</panel.string>
 				<panel.string name="default system device">Valeur par défaut du système</panel.string>
 				<panel.string name="name_default_system_device">Valeur par défaut du système</panel.string>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_terrain_texture_transform.xml b/indra/newview/skins/default/xui/fr/panel_region_terrain_texture_transform.xml
new file mode 100644
index 0000000000..2e2937b487
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_region_terrain_texture_transform.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Terrain" name="Terrain">
+	<text name="region_text_lbl">
+		Région :
+	</text>
+	<text name="region_text">
+		inconnue
+	</text>
+	<text name="detail_texture_text">
+		Textures du terrain
+	</text>
+	<text name="detail_material_text">
+		Matériaux du terrain
+	</text>
+	<check_box label="PBR métal rugosité" name="terrain_material_type" tool_tip="Si cette option est cochée, les matériaux PBR métal rugosité sont utilisés pour le terrain. Sinon, utiliser les textures."/>
+	<text name="height_text_lbl">
+		1 (Bas)
+	</text>
+	<text name="height_text_lbl4">
+		4 (Élevé)
+	</text>
+	<layout_stack name="terrain_features_stack">
+		<layout_panel name="frame_settings_terrain">
+			<tab_container name="terrain_tabs">
+				<panel label="Élévation" name="terrain_elevation_panel"/>
+				<panel label="Transformations" name="terrain_transform_panel"/>
+			</tab_container>
+		</layout_panel>
+	</layout_stack>
+	<button label="Appliquer" name="apply_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_settings_terrain_elevation.xml b/indra/newview/skins/default/xui/fr/panel_settings_terrain_elevation.xml
new file mode 100644
index 0000000000..f12f5bed4d
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_settings_terrain_elevation.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_settings_terrain_elevation">
+	<spinner label="Niveau de l'eau" name="water_height_spin"/>
+	<spinner label="Limite haute du terrain" name="terrain_raise_spin"/>
+	<spinner label="Limite basse du terrain" name="terrain_lower_spin"/>
+	<text name="height_text_lbl5">
+		Plages d'élévation de la texture
+	</text>
+	<text name="height_text_lbl5_material">
+		Plages d'élévation des matériaux
+	</text>
+	<text name="height_text_lbl10">
+		Ces valeurs représentent la plage de mélange pour les textures ci-dessus.
+	</text>
+	<text name="height_text_lbl10_material">
+		Ces valeurs représentent la plage de mélange pour les matériaux ci-dessus.
+	</text>
+	<text name="height_text_lbl11">
+		Mesurée en mètres, la valeur BASSE est la hauteur MAXIMALE de la texture #1, et la valeur HAUTE est la hauteur MINIMALE de la texture #4.
+	</text>
+	<text name="height_text_lbl11_material">
+		Mesurée en mètres, la valeur BASSE est la hauteur MAXIMALE du matériau n°1, et la valeur HAUTE est la hauteur MINIMALE du matériau n°4.
+	</text>
+	<text name="height_text_lbl6">
+		Nord-Ouest
+	</text>
+	<text name="height_text_lbl7">
+		Nord-Est
+	</text>
+<!--  northwest low-->
+	<spinner label="Bas" name="height_start_spin_1"/>
+<!--    northeast low-->
+	<spinner label="Bas" name="height_start_spin_3"/>
+<!--  northwest high-->
+	<spinner label="Haut" name="height_range_spin_1"/>
+<!--  northeast high-->
+	<spinner label="Haut" name="height_range_spin_3"/>
+	<text name="height_text_lbl8">
+		Sud-ouest
+	</text>
+	<text name="height_text_lbl9">
+		Sud-Est
+	</text>
+<!--  southwest low-->
+	<spinner label="Bas" name="height_start_spin_0"/>
+<!--  southeast low-->
+	<spinner label="Bas" name="height_start_spin_2"/>
+<!--southwest high-->
+	<spinner label="Haut" name="height_range_spin_0"/>
+<!--  southeast high-->
+	<spinner label="Haut" name="height_range_spin_2"/>
+<!-- Terrain Download/Upload/Bake buttons -->
+	<button label="Télécharger un terrain RAW..." name="download_raw_btn" tool_tip="Disponible uniquement pour les propriétaires, pas pour les gestionnaires"/>
+	<button label="Téléverser un terrain RAW..." name="upload_raw_btn" tool_tip="Disponible uniquement pour les propriétaires, pas pour les gestionnaires"/>
+	<button label="Figer le terrain" name="bake_terrain_btn" tool_tip="Définir le terrain actuel comme point médian pour les limites supérieures/inférieures"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_settings_terrain_transform.xml b/indra/newview/skins/default/xui/fr/panel_settings_terrain_transform.xml
new file mode 100644
index 0000000000..8832e3eb36
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_settings_terrain_transform.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Étalonnage" name="panel_settings_terrain_transform">
+	<text name="terrain0ScaleU_label">
+		Échelle u
+	</text>
+	<spinner label="Échelle u" name="terrain0ScaleU"/>
+	<text name="terrain0ScaleV_label">
+		Échelle v
+	</text>
+	<spinner label="Échelle v" name="terrain0ScaleV"/>
+	<text name="terrain0Rotation_label">
+		Rotation
+	</text>
+	<spinner label="Rotation" name="terrain0Rotation"/>
+	<text name="terrain0OffsetU_label">
+		Décalage u
+	</text>
+	<spinner label="Décalage u" name="terrain0OffsetU"/>
+	<text name="terrain0OffsetV_label">
+		Décalage v
+	</text>
+	<spinner label="Décalage v" name="terrain0OffsetV"/>
+</panel>

From 96ef422551d8359cd1d670bc225468584670f072 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Tue, 3 Sep 2024 22:11:08 +0100
Subject: [PATCH 23/28] Let's just try Linux without the dumpSyms

---
 .github/workflows/build_viewer.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build_viewer.yml b/.github/workflows/build_viewer.yml
index 579566361c..da55ace014 100644
--- a/.github/workflows/build_viewer.yml
+++ b/.github/workflows/build_viewer.yml
@@ -315,11 +315,11 @@ jobs:
           echo "viewer_build=$viewer_build" >> "$GITHUB_OUTPUT"
           echo "viewer_channel=${{ env.FS_RELEASE_CHAN }}" >> "$GITHUB_OUTPUT"
           echo "viewer_release_type=${{ env.FS_RELEASE_TYPE }}" >> "$GITHUB_OUTPUT"
-      - name: Install node-dump-syms
-        if: runner.os == 'Linux'
-        run: |
-          npm install -g node-pre-gyp          
-          npm install -g node-dump-syms          
+      # - name: Install node-dump-syms
+      #   if: runner.os == 'Linux'
+      #   run: |
+      #     npm install -g node-pre-gyp          
+      #     npm install -g node-dump-syms          
 
       - name: Post Bugsplat Symbols
         uses: beqjanus/symbol-upload@main
@@ -350,7 +350,7 @@ jobs:
           files: ${{ runner.os == 'Windows' && '**/Release/*.{pdb,exe,dll}' || runner.os == 'macOS' && '**/*.xcarchive.zip' || '**/{do-not-run-directly-firestorm-bin,*.sym}' }}
           directory: "build-*"
           node-version: "20"
-          dumpSyms: ${{ runner.os == 'Linux' && 'true' || 'false' }}
+          dumpSyms: false
       - name: Publish artifacts
         if: runner.os == 'Windows'
         uses: actions/upload-artifact@v4

From ba9e45a12ff637ce5505671163b7693ccf709752 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Wed, 4 Sep 2024 00:34:40 +0200
Subject: [PATCH 24/28] FIRE-34470 Italian Translation Update, by Spartaco
 Zemenis

---
 .../xui/it/floater_change_item_thumbnail.xml  |  6 ++
 .../floater_preferences_graphics_advanced.xml | 16 ++++--
 .../default/xui/it/menu_gallery_inventory.xml | 33 +++++++++++
 .../default/xui/it/menu_nearby_media.xml      |  5 ++
 .../skins/default/xui/it/menu_object.xml      | 10 +++-
 .../skins/default/xui/it/menu_viewer.xml      | 34 ++++++++----
 .../skins/default/xui/it/notifications.xml    | 25 ++++++++-
 .../xui/it/panel_fs_performance_nearby.xml    |  9 ++-
 .../xui/it/panel_preferences_graphics1.xml    | 55 ++++++-------------
 .../xui/it/panel_preferences_sound.xml        | 14 ++++-
 .../default/xui/it/panel_region_terrain.xml   | 40 +++++++-------
 ...panel_region_terrain_texture_transform.xml | 31 +++++++++++
 .../it/panel_settings_terrain_elevation.xml   | 47 ++++++++++++++++
 .../it/panel_settings_terrain_transform.xml   | 18 ++++++
 14 files changed, 265 insertions(+), 78 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/it/menu_nearby_media.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_region_terrain_texture_transform.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_settings_terrain_elevation.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_settings_terrain_transform.xml

diff --git a/indra/newview/skins/default/xui/it/floater_change_item_thumbnail.xml b/indra/newview/skins/default/xui/it/floater_change_item_thumbnail.xml
index fe92cdd222..471f74b86c 100644
--- a/indra/newview/skins/default/xui/it/floater_change_item_thumbnail.xml
+++ b/indra/newview/skins/default/xui/it/floater_change_item_thumbnail.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="change_item_thumbnail" title="Cambia Immagine Elemento">
+	<floater.string name="multiple_item_names">
+		Più elementi selezionati
+	</floater.string>
 	<floater.string name="title_item_thumbnail">
 		Cambia Immagine Elemento
 	</floater.string>
@@ -24,6 +27,9 @@
 	<floater.string name="tooltip_remove_image">
 		Rimuovi immagine
 	</floater.string>
+	<text name="multiple_lbl">
+		Immagini multiple
+	</text>
 	<text name="tooltip_text">
 		suggerimento
 	</text>
diff --git a/indra/newview/skins/default/xui/it/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/it/floater_preferences_graphics_advanced.xml
index c018911a24..49d96895b4 100644
--- a/indra/newview/skins/default/xui/it/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/it/floater_preferences_graphics_advanced.xml
@@ -9,10 +9,19 @@
 	<text name="PostProcessText">
 		Basso
 	</text>
+	<slider label="Max luci vicine:" name="MaxLights" />
 	<check_box label="Abilita VSync" name="vsync" tool_tip="Sincronizza il numero di fotogrammi al secondo con la frequenza di aggiornamento del monitor, il che potrebbe comportare una riduzione della fluidità e del ritardo visibili." />
 	<text name="AvatarText">
 		Avatar
 	</text>
+	<text name="AvatarComplexityModeLabel">
+		Rendering avatar:
+	</text>
+	<combo_box name="AvatarComplexityMode">
+		<combo_box.item label="Limita per complessità" name="0" />
+		<combo_box.item label="Mostra sempre amici" name="1" />
+		<combo_box.item label="Mostra solo amici" name="2" />
+	</combo_box>
 	<slider label="Complessità massima:" name="IndirectMaxComplexity" tool_tip="Definisce il punto in cui un avatar dall&apos;aspetto complesso viene visualizzato come JellyDoll"/>
 	<slider label="N. max di non impostori:" name="IndirectMaxNonImpostors"/>
 	<slider label="Dettagli:" name="AvatarMeshDetail"/>
@@ -102,10 +111,9 @@
 		Update specchi:
 	</text>
 	<combo_box name="HeroProbeUpdateRate">
-		<combo_box.item label="Ogni frame" name="0" />
-		<combo_box.item label="Ogni 2 frame" name="1" />
-		<combo_box.item label="Ogni 3 frame" name="2" />
-		<combo_box.item label="Ogni 4 frame" name="3" />
+		<combo_box.item label="Lento" name="6"/>
+		<combo_box.item label="Medio" name="3" />
+		<combo_box.item label="Veloce" name="1" />
 	</combo_box>
 	<button label="Ripristina impostazioni predefinite" name="Defaults"/>
 	<button label="Annulla" label_selected="Annulla" name="Cancel"/>
diff --git a/indra/newview/skins/default/xui/it/menu_gallery_inventory.xml b/indra/newview/skins/default/xui/it/menu_gallery_inventory.xml
index 77d4651963..337c2dabb4 100644
--- a/indra/newview/skins/default/xui/it/menu_gallery_inventory.xml
+++ b/indra/newview/skins/default/xui/it/menu_gallery_inventory.xml
@@ -49,6 +49,39 @@
 	<menu_item_call label="Togli" name="Take Off"/>
 	<menu_item_call label="Applica solo a me stesso" name="Settings Apply Local" />
 	<menu_item_call label="Applica al lotto" name="Settings Apply Parcel" />
+	<menu label="Crea nuovo" name="create_new">
+		<menu_item_call label="Nuova cartella" name="New Folder"/>
+		<menu_item_call label="Nuovo script" name="New Script"/>
+		<menu_item_call label="Nuova annotazione" name="New Note"/>
+		<menu_item_call label="Nuovo gesto" name="New Gesture"/>
+		<menu_item_call label="Nuovo materiale" name="New Material"/>
+		<menu label="Nuovo indumento" name="New Clothes">
+			<menu_item_call label="Nuova camicia" name="New Shirt"/>
+			<menu_item_call label="Nuovi pantaloni" name="New Pants"/>
+			<menu_item_call label="Nuove scarpe" name="New Shoes"/>
+			<menu_item_call label="Nuove calze" name="New Socks"/>
+			<menu_item_call label="Nuova giacca" name="New Jacket"/>
+			<menu_item_call label="Nuova gonna" name="New Skirt"/>
+			<menu_item_call label="Nuovi guanti" name="New Gloves"/>
+			<menu_item_call label="Nuova canottiera" name="New Undershirt"/>
+			<menu_item_call label="Nuovo slip" name="New Underpants"/>
+			<menu_item_call label="Nuovo alfa" name="New Alpha Mask"/>
+			<menu_item_call label="Nuovo tatuaggio" name="New Tattoo"/>
+			<menu_item_call label="Nuovo universale" name="New Universal"/>
+			<menu_item_call label="Nuova fisica" name="New Physics"/>
+		</menu>
+		<menu label="Nuova parte del corpo" name="New Body Parts">
+			<menu_item_call label="Nuovo corpo" name="New Shape"/>
+			<menu_item_call label="Nuova pelle" name="New Skin"/>
+			<menu_item_call label="Nuovi capelli" name="New Hair"/>
+			<menu_item_call label="Nuovi occhi" name="New Eyes"/>
+		</menu>
+		<menu label="Nuovo ambiente" name="New Settings">
+			<menu_item_call label="Nuovo cielo" name="New Sky" />
+			<menu_item_call label="Nuova acqua" name="New Water" />
+			<menu_item_call label="Nuovo ciclo giornata" name="New Day Cycle" />
+		</menu>
+	</menu>
 	<menu_item_call label="Crea cartella dagli elementi selezionati" name="New folder from selected" />
 	<menu_item_call label="Separa gli elementi della cartella" name="Ungroup folder items" />
 	<menu label="Usa come predefinita per" name="upload_def">
diff --git a/indra/newview/skins/default/xui/it/menu_nearby_media.xml b/indra/newview/skins/default/xui/it/menu_nearby_media.xml
new file mode 100644
index 0000000000..13551f9eb0
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_nearby_media.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_nearby_media">
+	<menu_item_call label="Copia URL" name="copy_url" />
+	<menu_item_call label="Copia dati" name="copy_data" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_object.xml b/indra/newview/skins/default/xui/it/menu_object.xml
index 29d8f85497..5465fe58af 100644
--- a/indra/newview/skins/default/xui/it/menu_object.xml
+++ b/indra/newview/skins/default/xui/it/menu_object.xml
@@ -41,8 +41,14 @@
 	<menu_item_call label="De-rendi" name="Derender"/>
 	<menu_item_call label="De-rendi + lista nera" name="DerenderPermanent"/>
 	<menu_item_call label="Restituisci" name="Return..."/>
-	<menu_item_call label="Prendi" name="Pie Object Take"/>
-	<menu_item_call label="Prendi copia" name="Take Copy"/>
+	<context_menu label="Prendi oggetto" name="Take Submenu">
+		<menu_item_call label="Prendi" name="Pie Object Take" />
+		<menu_item_call label="Prendi copia" name="Take Copy" />
+		<menu_item_call label="Prendi come multi-oggetto" name="Take combined" />
+		<menu_item_call label="Prendi copia come multi-oggetto" name="Take Copy combined" />
+		<menu_item_call label="Prendi come oggetti separati" name="Take Separate" />
+		<menu_item_call label="Prendi copie come oggetti separati" name="Take Copy Separate" />
+	</context_menu>
 	<menu_item_call label="Paga" name="Pay..."/>
 	<menu_item_call label="Acquista" name="Buy..."/>
 	<context_menu label="Esporta" name="Export Menu">
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index 236b00231c..2e409fe37c 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -170,6 +170,11 @@
 		<menu_item_call label="Esplora Animazioni" name="Animation Explorer"/>
 		<menu_item_call label="Lista Nera" name="asset_blacklist"/>
 		<menu_item_call label="Impostazioni Rendering Avatar" name="Avatar Render Settings"/>
+		<menu label="Rendering avatar" name="AvatarComplexityMode">
+			<menu_item_check label="Limita per complessità" name="complexity_limit_everone" />
+			<menu_item_check label="Mostra sempre amici" name="complexity_always_show_friends" />
+			<menu_item_check label="Mostra solo amici" name="complexity_only_show_friends" />
+		</menu>
 		<menu_item_check label="Mostra solo amici" name="Render Friends Only"/>
 	</menu>
 	<menu label="Costruisci" name="BuildTools">
@@ -457,6 +462,11 @@
 			<menu_item_call label="Forza Disconnetti viewer" name="Force Disconnect Viewer"/>
 			<menu_item_call label="Simula Memory Leak" name="Memory Leaking Simulation"/>
 		</menu>
+		<menu name="GLTF">
+			<menu_item_call label="Apri..." name="Open..." />
+			<menu_item_call label="Salva come..." name="Save As..." />
+			<menu_item_call label="Carica..." name="Upload..." />
+		</menu>
 		<menu label="Test rendering" name="Render Tests">
 			<menu_item_check label="Camera Offset" name="Camera Offset"/>
 			<menu_item_check label="Randomize Framerate" name="Randomize Framerate"/>
@@ -594,6 +604,7 @@
 				<menu_item_call label="Test maschio" name="Test Male"/>
 				<menu_item_call label="Test femmina" name="Test Female"/>
 				<menu_item_check label="Permetti di selezionare gli avatar" name="Allow Select Avatar"/>
+				<menu_item_check label="Renderizza solo gli amici" name="Render Only Friends" />
 			</menu>
 			<menu label="Velocità animazioni" name="Animation Speed">
 				<menu_item_call label="Tutte 10% più veloci" name="All Animations 10 Faster"/>
@@ -601,21 +612,22 @@
 				<menu_item_call label="Reset velocità" name="Reset All Animation Speed"/>
 				<menu_item_check label="Animazioni slow motion" name="Slow Motion Animations"/>
 			</menu>
-			<menu_item_call label="Forza param all'originale" name="Force Params to Default"/>
+			<menu_item_call label="Forza parametri all'originale" name="Force Params to Default"/>
 			<menu_item_check label="Info animazione" name="Animation Info"/>
 			<menu_item_check label="Mostra sguardo" name="Show Look At"/>
 			<menu_item_check label="Mostra selezione" name="Show Point At"/>
-			<menu_item_check label="Debug Joint Updates" name="Debug Joint Updates"/>
+			<menu_item_check label="Debug aggiornamenti joint" name="Debug Joint Updates"/>
 			<menu_item_check label="Disabilita LOD" name="Disable LOD"/>
-			<menu_item_check label="Debug Character Vis" name="Debug Character Vis"/>
-			<menu_item_check label="Mostra Collision Skeleton" name="Show Collision Skeleton"/>
-			<menu_item_check label="Mostra scheletro" name="Show Bones"/>
-			<menu_item_check label="Mostra Agent Target" name="Display Agent Target"/>
-			<menu_item_check label="Mostra Impostor Extents" name="Show Impostor Extents"/>
-			<menu_item_call label="Scarica Attachments" name="Dump Attachments"/>
-			<menu_item_call label="Debug Texture avatar" name="Debug Avatar Textures"/>
-			<menu_item_call label="Scarica Texture locali" name="Dump Local Textures"/>
-			<menu_item_call label="Ricarica Avatar Cloud Particle" name="Reload Avatar Cloud Particle"/>
+			<menu_item_check label="Debug Vis personaggi" name="Debug Character Vis"/>
+			<menu_item_check label="Debug stato caricamento personaggi" name="Debug Character Rez State" />
+			<menu_item_check label="Mostra scheletro collisione" name="Show Collision Skeleton"/>
+			<menu_item_check label="Mostra ossa" name="Show Bones"/>
+			<menu_item_check label="Mostra target agente" name="Display Agent Target"/>
+			<menu_item_check label="Mostra intervalli avatar impostor" name="Show Impostor Extents"/>
+			<menu_item_call label="Dump attachment" name="Dump Attachments"/>
+			<menu_item_call label="Debug texture avatar" name="Debug Avatar Textures"/>
+			<menu_item_call label="Dump texture locali" name="Dump Local Textures"/>
+			<menu_item_call label="Ricarica nuvola particelle dell'avatar" name="Reload Avatar Cloud Particle"/>
 		</menu>
 		<menu_item_check label="Texture HTTP" name="HTTP Textures"/>
 		<menu_item_check label="Inventario HTTP" name="HTTP Inventory"/>
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index 5ec1a9da48..00393a5f19 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -2385,6 +2385,9 @@ Rimuovere questi elementi dal tuo avatar?
 	<notification name="ThumbnailOutfitPhoto">
 		Per aggiungere l'immagine ad un abito, utilizza la finestra Aspetto - Galleria oppure clicca con il pulsante destro del mouse sulla cartella dell'abito e seleziona "Immagine..."
 	</notification>
+	<notification name="ThumbnailSelectionTooLarge">
+		Puoi modificare un massimo di 50 miniature alla volta.
+	</notification>
 	<notification name="ConfirmUnlink">
 		Scollegare l&apos;oggetto selezionato?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="Scollega"/>
@@ -3431,6 +3434,11 @@ Se sei un utente Premium, [[PREMIUM_URL] clic qui] per ricevere la tua offerta d
 	<notification name="VoiceEffectsNew">
 		Sono disponibili nuove manipolazioni vocali.
 	</notification>
+	<notification name="VoiceEffectsNotSupported">
+		La trasformazione vocale non è supportata da questo viewer. 
+Per maggiori informazioni su altri strumenti di trasformazione vocale, consulta [[FAQ_URL] questo articolo].
+		<usetemplate ignoretext="Avvisami se la trasformazione vocale non è supportata" name="okignore" />
+	</notification>
 	<notification name="Cannot enter parcel: not a group member">
 		Soltanto i membri di un determinato gruppo possono visitare questa zona.
 	</notification>
@@ -5270,9 +5278,24 @@ Se vuoi vedere questo oggetto, toglilo e indossalo su un punto di attacco dell'a
 		Stai modificando un cielo non HDR che è stato automaticamente convertito in HDR. Per rimuovere l'HDR e la mappatura dei toni, imposta l'ambiente della sonda di riflessione su zero.
 		<usetemplate ignoretext="Avvisi sulla regolazione del cielo HDR" name="okignore" yestext="Ok"/>
 	</notification>
-	<notification name="GLTFPreviewSelection">
+	<notification name="GLTFOpenSelection">
 		Devi selezionare un oggetto che fungerà da handle per la risorsa GLTF che stai visualizzando.
 	</notification>
+	<notification name="GLTFLoadFailed">
+		Impossibile caricare il file GLTF. Vedi il registro per i dettagli.
+	</notification>
+	<notification name="GLTFSaveFailed">
+		Impossibile salvare il file GLTF. Vedi il registro per i dettagli.
+	</notification>
+	<notification name="GLTFSaveSelection">
+		È necessario selezionare un oggetto a cui è associata una risorsa GLTF.
+	</notification>
+	<notification name="GLTFUploadSelection">
+		È necessario selezionare un oggetto a cui è associata una risorsa GLTF locale.
+	</notification>
+	<notification name="GLTFUploadInProgress">
+		Il caricamento è attualmente in corso. Riprova più tardi.
+	</notification>
 	<notification name="EnableAutoFPSWarning">
 		Stai per abilitare AutoFPS. Tutte le impostazioni grafiche non salvate andranno perse.
 
diff --git a/indra/newview/skins/default/xui/it/panel_fs_performance_nearby.xml b/indra/newview/skins/default/xui/it/panel_fs_performance_nearby.xml
index 91ec36e3c4..621927b7ae 100644
--- a/indra/newview/skins/default/xui/it/panel_fs_performance_nearby.xml
+++ b/indra/newview/skins/default/xui/it/panel_fs_performance_nearby.xml
@@ -30,7 +30,14 @@
 	<text name="av_nearby_desc3">
 		Il tuo avatar include le risorse per il viewer. Usa la scheda Indossati per vedere il tuo impatto sugli altri.
 	</text>
-	<check_box label="Mostra gli amici sempre con il massimo dettaglio" name="display_friends" />
+	<text name="AvatarComplexityMode_Label">
+		Rendering avatar:
+	</text>
+	<combo_box name="AvatarComplexityMode">
+		<combo_box.item label="Limita per complessità" name="complexity_limit_everone" />
+		<combo_box.item label="Mostra sempre amici" name="complexity_always_show_friends" />
+		<combo_box.item label="Mostra solo amici" name="complexity_only_show_friends" />
+	</combo_box>
 	<button label="Eccezioni..." name="exceptions_btn" />
 	<check_box label="Nascondi tutti gli avatar" name="hide_avatars" />
 	<text name="name_tags_textbox">
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 ac48786c37..239101b5af 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
@@ -5,6 +5,9 @@
 			<text name="preset_label">
 				Preset in uso:
 			</text>
+			<text name="preset_text">
+				(Nessuno)
+			</text>
 			<text name="QualitySpeed">
 				Qualità e velocità:
 			</text>
@@ -14,6 +17,7 @@
 			<text name="BetterText">
 				Qualità
 			</text>
+			<button tool_tip="Ripristina le impostazioni grafiche predefinite." name="Defaults" />
 			<text name="ShadersPrefText">
 				Bassa
 			</text>
@@ -23,9 +27,6 @@
 			<text name="ShadersPrefText3">
 				Alta
 			</text>
-			<text name="ShadersPrefText4">
-				Ultra
-			</text>
 			<text name="ShadersText">
 				Effetti grafici:
 			</text>
@@ -58,18 +59,6 @@
 				<combo_box.item label="Manuale e terreno" name="2"/>
 				<combo_box.item label="Scena completa" name="3"/>
 			</combo_box>
-			<!-- <text name="reflection_label">
-				Riflesso sull’Acqua:
-			</text>
-			combo_box name="Reflections">
-				<combo_box.item label="Nessuno (opaco)" name="-2"/>
-				<combo_box.item label="Nessuno (trasparente)" name="-1"/>
-				<combo_box.item label="Minimo" name="0"/>
-				<combo_box.item label="Terreno e alberi" name="1"/>
-				<combo_box.item label="Tutti gli oggetti statici" name="2"/>
-				<combo_box.item label="Tutti gli avatar e gli oggetti" name="3"/>
-				<combo_box.item label="Tutto" name="4"/>
-			</combo_box> -->
 			<text name="local lights_label" tool_tip="Imposta il numero di punti luce resi. Richiede riavvio per cambiare modalità">
 				Punti Luce (richiede riavvio):
 			</text>
@@ -85,20 +74,28 @@
 				Update specchi:
 			</text>
 			<combo_box name="HeroProbeUpdateRate">
-				<combo_box.item label="Ogni frame" name="0" />
-				<combo_box.item label="Ogni 2 frame" name="1" />
-				<combo_box.item label="Ogni 3 frame" name="2" />
-				<combo_box.item label="Ogni 4 frame" name="3" />
+				<combo_box.item label="Lento" name="6"/>
+				<combo_box.item label="Medio" name="3" />
+				<combo_box.item label="Veloce" name="1" />
 			</combo_box>
 			<check_box label="Schermo intero (richiede riavvio)" name="Fullscreen Mode" tool_tip="Avvia Firestorm in modalità Schermo Intero (richiede riavvio)"/>
 			<slider label="Distanza di disegno" name="DrawDistance"/>
 			<slider label="Numero max particelle" name="MaxParticleCount"/>
+			<text name="AvatarComplexityModeLabel">
+				Rendering avatar
+			</text>
+			<combo_box name="AvatarComplexityMode">
+				<combo_box.item label="Limita per complessità" name="0" />
+				<combo_box.item label="Mostra sempre amici" name="1" />
+				<combo_box.item label="Mostra solo amici" name="2" />
+			</combo_box>
 			<slider label="Massima complessità" name="IndirectMaxComplexity" tool_tip="Controlla il livello a cui un avatar complesso viene visto come pupazzo colorato (JellyDoll)"/>
 			<slider label="Numero max avatar completi" name="IndirectMaxNonImpostors"/>
 			<slider label="Qualità post-produzione" name="RenderPostProcess"/>
 			<text name="PostProcessText">
 				Bassa
 			</text>
+			<slider label="Max luci vicine" name="MaxLights" />
 			<slider label="Fisica Avatar" name="AvatarPhysicsDetail"/>
 			<slider label="Esposizione" name="RenderExposure"/>
 			<text name="MeshDetailText">
@@ -110,21 +107,12 @@
 			<slider label="  Avatar" name="AvatarMeshDetail"/>
 			<slider label="  Terreno" name="TerrainMeshDetail"/>
 			<slider label="  Cielo" name="SkyMeshDetail"/>
-			<check_box label="Vestiti in tessuto flessibile" name="AvatarCloth"/>
-			<!-- <text name="TerrainDetailText">
-				Dettagli del terreno:
-			</text>
-			<radio_group name="TerrainDetailRadio">
-				<radio_item label="Basso" name="0"/>
-				<radio_item label="Alto" name="2"/>
-			</radio_group> -->
 			<text name="Presets_Label">
 				Preset:
 			</text>
 			<button label="Salva" name="PrefSaveButton"/>
 			<button label="Carica" name="PrefLoadButton"/>
 			<button label="Elimina" name="PrefDeleteButton"/>
-			<button label="Reset" name="Defaults" tool_tip="Ricarica impostazioni predefinite"/>
 		</panel>
 		<panel label="Impostazioni Hardware" name="Hardware Settings">
 			<check_box label="Filtro Anisotropico (rallenta se attivo)" name="ani" tool_tip="Il filtro anisotropico è un metodo per migliorare la qualità delle texture quando vengono visualizzate ad angoli relativamente ampi rispetto alla posizione della fotocamera. Di solito le rende meno sfocate a distanze maggiori."/>
@@ -152,15 +140,7 @@
 				Rendering texture:
 			</text>
 			<!-- Removed in FIRE-24256, leaving it here for non-SL viewer version --> <check_box label="Usa texture HTTP" tool_tip="Caricare le texture utilizzando il protocollo HTTP - non impostare se si hanno problemi di resa e/o si desidera caricare col vecchio protocollo UDP" name="TexturesHTTP"/>
-			<check_box width="260" label="Limita la risoluzione massima delle texture a:" tool_tip="Questa impostazione limita la risoluzione massima delle texture. Ciò consente di visualizzare più texture prima di superare la memoria disponibile per le texture e di non vederle sfocate." name="FSRestrictMaxTextureSize" />
-			<combo_box name="FSRestrictMaxTexturePixels">
-				<combo_box.item label="512 pixel" name="512" />
-				<combo_box.item label="1024 pixel" name="1024" />
-				<combo_box.item label="2048 pixel" name="2048" />
-			</combo_box>
-			<text name="FSRestrictMaxTextureSizeRestartText">
-				(richiede riavvio)
-			</text>
+			<check_box label="Limita la risoluzione massima delle texture a 512px (solo 64 bit; richiede riavvio)" tool_tip="Questa impostazione limita la risoluzione massima delle texture. Ciò consente di visualizzare più texture prima di superare la memoria disponibile per le texture e di non vederle sfocate." name="FSRestrictMaxTextureSize" />
 			<text name="TextureDetailLabel">
 				Max livello qualità texture:
 			</text>
@@ -194,7 +174,6 @@
 		<panel label="Profondità di Campo" name="DOF panel">
 			<check_box label="Abilita Profondità di Campo (PdC: sfoca la vista tranne che nella direzione della camera)" name="UseDoF"/>
 			<check_box label="Abilita in modalità Costruzione" name="RenderDepthOfFieldInEditMode"/>
-			<check_box label="Abilita sott'acqua" name="FSRenderDoFUnderwater"/>
 			<check_box label="La messa a fuoco della PdC segue il cursore" name="FSFocusPointFollowsPointer" tool_tip="La messa a fuoco della profondità di campo (PdC) seguirà il tuo mouse, questo comportamento corrisponde a quello visto quando si utilizza flycam. Utilizzare in combinazione con il blocco della messa a fuoco PdC." />
 			<slider label="F-Number Camera" name="CameraFNum" tool_tip="Il valore F è un valore della profondità di campo."/>
 			<slider label="Lunghezza focale (mm):" name="CameraFocal" tool_tip="A che distanza avviene la messa a fuoco (in millimetri)."/>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_sound.xml b/indra/newview/skins/default/xui/it/panel_preferences_sound.xml
index 855fe2128d..97e670c895 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_sound.xml
@@ -124,7 +124,19 @@
 			<check_box label="Rifiuta automaticamente gli inviti alla chat vocale di gruppo" name="VoiceCallsRejectGroup"/>
 			<check_box label="Rifiuta automaticamente gli inviti alla chat vocale in conferenza (ad-hoc)" name="VoiceCallsRejectAdHoc"/>
 			<check_box label="Rifiuta automaticamente gli inviti alla chat vocale P2P (avatar con avatar)" name="VoiceCallsRejectP2P"/>
-			<check_box label="Accendi/spegni il microfono quando premo il pulsante sulla barra degli strumenti" name="push_to_talk_toggle_check" tool_tip="Se questa funzione è attiva, premere e rilasciare UNA VOLTA il pulsante per accendere o spegnere il microfono. Se questa funzione è disattivata, il microfono trasmette la tua voce solo mentre il pulsante viene tenuto premuto."/>
+			<check_box label="Accendi/spegni il microfono utilizzando il pulsante sulla barra" name="push_to_talk_toggle_check" tool_tip="Se questa funzione è attiva, premere e rilasciare UNA VOLTA il pulsante per accendere o spegnere il microfono. Se questa funzione è disattivata, il microfono trasmette la tua voce solo mentre il pulsante viene tenuto premuto."/>
+			<check_box tool_tip="Seleziona per abilitare la cancellazione dell'eco vocale" label="Cancellazione dell'eco" name="enable_echo_cancellation" />
+			<check_box tool_tip="Seleziona per abilitare il controllo automatico del guadagno" label="Controllo automatico del guadagno" name="voice_automatic_gain_control" />
+			<text left_pad="10" name="noise_suppression_label" width="138">
+				Soppressione del rumore:
+			</text>
+			<combo_box name="noise_suppression_combo">
+				<item label="Disabilitata" name="noise_suppression_none" />
+				<item label="Bassa" name="noise_suppression_low" />
+				<item label="Moderata" name="noise_suppression_moderate" />
+				<item label="Alta" name="noise_suppression_high" />
+				<item label="Massima" name="noise_suppression_max" />
+			</combo_box>
 			<button label="Impostazioni periferiche audio" name="device_settings_btn"/>
 			<panel label="Impostazione periferiche" name="device_settings_panel">
 				<panel.string name="default_text">
diff --git a/indra/newview/skins/default/xui/it/panel_region_terrain.xml b/indra/newview/skins/default/xui/it/panel_region_terrain.xml
index 58c78dfa78..bd9cc58c2e 100644
--- a/indra/newview/skins/default/xui/it/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_terrain.xml
@@ -6,21 +6,21 @@
 	<text name="region_text" left_delta="60">
 		sconosciuta
 	</text>
-	<spinner label="Altezza dell&apos;acqua" name="water_height_spin"/>
-	<spinner label="Limite altezza" name="terrain_raise_spin"/>
-	<spinner bottom_delta="-34" label="Limite profondità" name="terrain_lower_spin"/>
+	<spinner label="Altezza dell'acqua" name="water_height_spin"/>
+	<spinner label="Limite innalzamento" name="terrain_raise_spin"/>
+	<spinner label="Limite abbassamento" name="terrain_lower_spin"/>
 	<text name="detail_texture_text">
 		Texture terreno
 	</text>
 	<text name="detail_material_text">
 		Materiali terreno
 	</text>
-	<check_box label="Rugosità/Metallicità PBR" name="terrain_material_type" tool_tip="Se selezionato, utilizza i materiali PBR per il terreno, altrimenti utilizza le texture." />
+	<check_box label="Rugosità Metallicità PBR" name="terrain_material_type" tool_tip="Se selezionato, utilizza i materiali PBR per il terreno, altrimenti utilizza le texture." />
 	<text name="height_text_lbl">
-		1 (basso)
+		1 (Basso)
 	</text>
 	<text name="height_text_lbl4">
-		4 (alto)
+		4 (Alto)
 	</text>
 	<text name="height_text_lbl5">
 		Intervalli altitudine texture
@@ -41,27 +41,27 @@
 		Misurato in metri, il valore BASSO è la MASSIMA altezza del materiale 1 e il valore ALTO è l&apos;altezza MINIMA del materiale 4.
 	</text>
 	<text name="height_text_lbl6">
-		Nordovest
+		Nord-ovest
 	</text>
 	<text name="height_text_lbl7">
-		Nordest
+		Nord-est
 	</text>
-	<spinner label="basso" name="height_start_spin_1"/>
-	<spinner label="basso" name="height_start_spin_3"/>
-	<spinner label="alto" name="height_range_spin_1"/>
-	<spinner label="alto" name="height_range_spin_3"/>
+	<spinner label="Basso" name="height_start_spin_1"/>
+	<spinner label="Basso" name="height_start_spin_3"/>
+	<spinner label="Alto" name="height_range_spin_1"/>
+	<spinner label="Alto" name="height_range_spin_3"/>
 	<text name="height_text_lbl8">
-		Sudovest
+		Sud-ovest
 	</text>
 	<text name="height_text_lbl9">
-		Sudest
+		Sud-est
 	</text>
-	<spinner label="basso" name="height_start_spin_0"/>
-	<spinner label="basso" name="height_start_spin_2"/>
-	<spinner label="alto" name="height_range_spin_0"/>
-	<spinner label="alto" name="height_range_spin_2"/>
-	<button label="Scarica RAW terreno ..." name="download_raw_btn" tool_tip="Disponibile solo per i proprietari del terreno, non per i manager"/>
+	<spinner label="Basso" name="height_start_spin_0"/>
+	<spinner label="Basso" name="height_start_spin_2"/>
+	<spinner label="Alto" name="height_range_spin_0"/>
+	<spinner label="Alto" name="height_range_spin_2"/>
+	<button label="Scarica RAW terreno..." name="download_raw_btn" tool_tip="Disponibile solo per i proprietari del terreno, non per i manager"/>
 	<button label="Carica RAW terreno..." name="upload_raw_btn" tool_tip="Disponibile solo per i proprietari del terreno, non per i manager"/>
-	<button label="Trasforma" name="bake_terrain_btn" tool_tip="Imposta il terreno corrente come punto medio per i limiti di innalzamento/abbassamento"/>
+	<button label="Bake terreno" name="bake_terrain_btn" tool_tip="Imposta il terreno corrente come punto medio per i limiti di innalzamento/abbassamento"/>
 	<button label="Applica" name="apply_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_region_terrain_texture_transform.xml b/indra/newview/skins/default/xui/it/panel_region_terrain_texture_transform.xml
new file mode 100644
index 0000000000..809df0892a
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_region_terrain_texture_transform.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Terreno" name="Terrain">
+	<text name="region_text_lbl">
+		Regione:
+	</text>
+	<text name="region_text" left_delta="60">
+		sconosciuta
+	</text>
+	<text name="detail_texture_text">
+		Texture terreno
+	</text>
+	<text name="detail_material_text">
+		Materiali terreno
+	</text>
+	<check_box label="Rugosità Metallicità PBR" name="terrain_material_type" tool_tip="Se selezionato, utilizza i materiali PBR per il terreno, altrimenti utilizza le texture." />
+	<text name="height_text_lbl">
+		1 (Basso)
+	</text>
+	<text name="height_text_lbl4">
+		4 (Alto)
+	</text>
+	<layout_stack name="terrain_features_stack">
+		<layout_panel name="frame_settings_terrain">
+			<tab_container name="terrain_tabs">
+				<panel label="Altitudine" name="terrain_elevation_panel" />
+				<panel label="Trasforma" name="terrain_transform_panel" />
+			</tab_container>
+		</layout_panel>
+	</layout_stack>
+	<button label="Applica" name="apply_btn" />
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_settings_terrain_elevation.xml b/indra/newview/skins/default/xui/it/panel_settings_terrain_elevation.xml
new file mode 100644
index 0000000000..e9637d0bba
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_settings_terrain_elevation.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Altitudine" name="panel_settings_terrain_elevation">
+	<spinner label="Altezza dell'acqua" name="water_height_spin" />
+	<spinner label="Limite innalzamento" name="terrain_raise_spin"/>
+	<spinner label="Limite abbassamento" name="terrain_lower_spin"/>
+	<text name="height_text_lbl5">
+		Intervalli altitudine texture
+	</text>
+	<text name="height_text_lbl5_material">
+		Intervalli altitudine materiali
+	</text>
+	<text name="height_text_lbl10">
+		Questi valori indicano l'intervallo di miscelazione per le texture sopra.
+	</text>
+	<text name="height_text_lbl10_material">
+		Questi valori indicano l'intervallo di miscelazione per i materiali sopra.
+	</text>
+	<text name="height_text_lbl11">
+		Misurato in metri, il valore BASSO è la MASSIMA altezza della texture 1 e il valore ALTO è l&apos;altezza MINIMA della texture 4.
+	</text>
+	<text name="height_text_lbl11_material">
+		Misurato in metri, il valore BASSO è la MASSIMA altezza del materiale 1 e il valore ALTO è l&apos;altezza MINIMA del materiale 4.
+	</text>
+	<text name="height_text_lbl6">
+		Nord-ovest
+	</text>
+	<text name="height_text_lbl7">
+		Nord-est
+	</text>
+	<spinner label="Basso" name="height_start_spin_1"/>
+	<spinner label="Basso" name="height_start_spin_3"/>
+	<spinner label="Alto" name="height_range_spin_1"/>
+	<spinner label="Alto" name="height_range_spin_3"/>
+	<text name="height_text_lbl8">
+		Sud-ovest
+	</text>
+	<text name="height_text_lbl9">
+		Sud-est
+	</text>
+	<spinner label="Basso" name="height_start_spin_0"/>
+	<spinner label="Basso" name="height_start_spin_2"/>
+	<spinner label="Alto" name="height_range_spin_0"/>
+	<spinner label="Alto" name="height_range_spin_2"/>
+	<button label="Scarica RAW terreno..." name="download_raw_btn" tool_tip="Disponibile solo per i proprietari del terreno, non per i manager"/>
+	<button label="Carica RAW terreno..." name="upload_raw_btn" tool_tip="Disponibile solo per i proprietari del terreno, non per i manager"/>
+	<button label="Bake terreno" name="bake_terrain_btn" tool_tip="Imposta il terreno corrente come punto medio per i limiti di innalzamento/abbassamento"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_settings_terrain_transform.xml b/indra/newview/skins/default/xui/it/panel_settings_terrain_transform.xml
new file mode 100644
index 0000000000..6e4c13a71f
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_settings_terrain_transform.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Trasforma" name="panel_settings_terrain_transform">
+	<text name="terrain0ScaleU_label">
+		Scala u
+	</text>
+	<text name="terrain0ScaleV_label">
+		Scala v
+	</text>
+	<text name="terrain0Rotation_label">
+		Rotazione
+	</text>
+	<text name="terrain0OffsetU_label">
+		Spostamento u
+	</text>
+	<text name="terrain0OffsetV_label">
+		Spostamento v
+	</text>
+</panel>

From ab19b772bbff7c6931e17c0bb12283935aa2c9ef Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Wed, 4 Sep 2024 00:37:21 +0200
Subject: [PATCH 25/28] Tiny label typo fix
 https://github.com/secondlife/viewer/commit/d2145142d9b2eac3493915d024df438b65b623d7#r146096173

---
 .../skins/default/xui/de/panel_settings_terrain_transform.xml   | 2 +-
 .../skins/default/xui/en/panel_settings_terrain_transform.xml   | 2 +-
 .../skins/default/xui/pl/panel_settings_terrain_transform.xml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/newview/skins/default/xui/de/panel_settings_terrain_transform.xml b/indra/newview/skins/default/xui/de/panel_settings_terrain_transform.xml
index 5b34396801..ecbd6fc54f 100644
--- a/indra/newview/skins/default/xui/de/panel_settings_terrain_transform.xml
+++ b/indra/newview/skins/default/xui/de/panel_settings_terrain_transform.xml
@@ -34,7 +34,7 @@
 	<spinner label="Skalierung u" name="terrain2Rotation"/>
 	<spinner label="Skalierung u" name="terrain3Rotation"/>
 	<text name="terrain0OffsetU_label">
-		Versatz y
+		Versatz u
 	</text>
 	<spinner label="Versatz u" name="terrain0OffsetU"/>
 	<spinner label="Skalierung u" name="terrain1OffsetU"/>
diff --git a/indra/newview/skins/default/xui/en/panel_settings_terrain_transform.xml b/indra/newview/skins/default/xui/en/panel_settings_terrain_transform.xml
index 0bf0d8cffc..350e405732 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_terrain_transform.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_terrain_transform.xml
@@ -288,7 +288,7 @@
    left="10"
    top_pad="0"
    width="170">
-      Offset y
+      Offset u
   </text>
   <spinner
    follows="left|top"
diff --git a/indra/newview/skins/default/xui/pl/panel_settings_terrain_transform.xml b/indra/newview/skins/default/xui/pl/panel_settings_terrain_transform.xml
index c6ed3616f9..ae9005cd53 100644
--- a/indra/newview/skins/default/xui/pl/panel_settings_terrain_transform.xml
+++ b/indra/newview/skins/default/xui/pl/panel_settings_terrain_transform.xml
@@ -10,7 +10,7 @@
 		Obrót
 	</text>
 	<text name="terrain0OffsetU_label">
-		Przesun. y
+		Przesun. u
 	</text>
 	<text name="terrain0OffsetV_label">
 		Przesun. v

From 34389c6cc28a86115acfeec805a411de3fa4e2e1 Mon Sep 17 00:00:00 2001
From: Brad Linden <46733234+brad-linden@users.noreply.github.com>
Date: Wed, 28 Aug 2024 16:20:25 -0700
Subject: [PATCH 26/28] Attempt to get better file/line info for LL_ERRS
 crahses in bugsplat. (#2447)

secondlife/viewer#2445
---
 indra/llcommon/llerror.cpp | 16 ----------------
 indra/llcommon/llerror.h   | 11 +++++------
 2 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index 12980da896..b9638b95ca 100644
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -1663,19 +1663,3 @@ namespace LLError
         sLocalizedOutOfMemoryWarning = message;
     }
 }
-
-void crashdriver(void (*callback)(int*))
-{
-    // The LLERROR_CRASH macro used to have inline code of the form:
-    //int* make_me_crash = NULL;
-    //*make_me_crash = 0;
-
-    // But compilers are getting smart enough to recognize that, so we must
-    // assign to an address supplied by a separate source file. We could do
-    // the assignment here in crashdriver() -- but then BugSplat would group
-    // all LL_ERRS() crashes as the fault of this one function, instead of
-    // identifying the specific LL_ERRS() source line. So instead, do the
-    // assignment in a lambda in the caller's source. We just provide the
-    // nullptr target.
-    callback(nullptr);
-}
diff --git a/indra/llcommon/llerror.h b/indra/llcommon/llerror.h
index e92a607076..db0d0f2f4c 100644
--- a/indra/llcommon/llerror.h
+++ b/indra/llcommon/llerror.h
@@ -420,9 +420,11 @@ typedef LLError::NoClassInfo _LL_CLASS_TO_LOG;
 #define LL_NEWLINE '\n'
 
 // Use this only in LL_ERRS or in a place that LL_ERRS may not be used
-#define LLERROR_CRASH                                   \
-{                                                       \
-    crashdriver([](int* ptr){ *ptr = 0; exit(*ptr); }); \
+#define LLERROR_CRASH                                \
+{                                                    \
+    int* make_me_crash = (int*)0xDEADBEEFDEADBEEFUL; \
+    *make_me_crash = 0;                              \
+    exit(*make_me_crash);                            \
 }
 
 #define LL_ENDL                                         \
@@ -524,7 +526,4 @@ LL_DEBUGS("SomeTag") performs the locking and map-searching ONCE, then caches
 the result in a static variable.
 */
 
-// used by LLERROR_CRASH
-void crashdriver(void (*)(int*));
-
 #endif // LL_LLERROR_H

From 240f69f8306b52ee9e1db083aaa23e511d43f99b Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Wed, 4 Sep 2024 00:44:07 +0100
Subject: [PATCH 27/28] correct case for VIEWER_VERSION.txt

---
 .github/workflows/build_viewer.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_viewer.yml b/.github/workflows/build_viewer.yml
index da55ace014..450eb091df 100644
--- a/.github/workflows/build_viewer.yml
+++ b/.github/workflows/build_viewer.yml
@@ -306,9 +306,9 @@ jobs:
         id: version
         shell: bash
         run: |
-          if [ -r "indra/newview/viewer_version.txt" ]
+          if [ -r "indra/newview/VIEWER_VERSION.txt" ]
           then
-              viewer_version="$(<"indra/newview/viewer_version.txt")"
+              viewer_version="$(<"indra/newview/VIEWER_VERSION.txt")"
               echo "viewer_version=$viewer_version" >> "$GITHUB_OUTPUT"
           fi
           viewer_build=$(git rev-list --count HEAD)

From b3d8cde4a33c9d0f014db816dd10632f50be5a24 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Wed, 4 Sep 2024 01:05:52 +0100
Subject: [PATCH 28/28] Revert "Attempt to get better file/line info for
 LL_ERRS crahses in bugsplat. (#2447)"

This reverts commit 34389c6cc28a86115acfeec805a411de3fa4e2e1.
This would require another TPV physics update
---
 indra/llcommon/llerror.cpp | 16 ++++++++++++++++
 indra/llcommon/llerror.h   | 11 ++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index b9638b95ca..12980da896 100644
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -1663,3 +1663,19 @@ namespace LLError
         sLocalizedOutOfMemoryWarning = message;
     }
 }
+
+void crashdriver(void (*callback)(int*))
+{
+    // The LLERROR_CRASH macro used to have inline code of the form:
+    //int* make_me_crash = NULL;
+    //*make_me_crash = 0;
+
+    // But compilers are getting smart enough to recognize that, so we must
+    // assign to an address supplied by a separate source file. We could do
+    // the assignment here in crashdriver() -- but then BugSplat would group
+    // all LL_ERRS() crashes as the fault of this one function, instead of
+    // identifying the specific LL_ERRS() source line. So instead, do the
+    // assignment in a lambda in the caller's source. We just provide the
+    // nullptr target.
+    callback(nullptr);
+}
diff --git a/indra/llcommon/llerror.h b/indra/llcommon/llerror.h
index db0d0f2f4c..e92a607076 100644
--- a/indra/llcommon/llerror.h
+++ b/indra/llcommon/llerror.h
@@ -420,11 +420,9 @@ typedef LLError::NoClassInfo _LL_CLASS_TO_LOG;
 #define LL_NEWLINE '\n'
 
 // Use this only in LL_ERRS or in a place that LL_ERRS may not be used
-#define LLERROR_CRASH                                \
-{                                                    \
-    int* make_me_crash = (int*)0xDEADBEEFDEADBEEFUL; \
-    *make_me_crash = 0;                              \
-    exit(*make_me_crash);                            \
+#define LLERROR_CRASH                                   \
+{                                                       \
+    crashdriver([](int* ptr){ *ptr = 0; exit(*ptr); }); \
 }
 
 #define LL_ENDL                                         \
@@ -526,4 +524,7 @@ LL_DEBUGS("SomeTag") performs the locking and map-searching ONCE, then caches
 the result in a static variable.
 */
 
+// used by LLERROR_CRASH
+void crashdriver(void (*)(int*));
+
 #endif // LL_LLERROR_H