From 8521a2b4df1fd4b61e1ef3eecb7ea933d741ed53 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Fri, 28 Jun 2024 22:02:33 +0200
Subject: [PATCH 1/4] Update German translation

---
 .../skins/default/xui/de/menu_viewer.xml      |  1 -
 .../skins/default/xui/de/notifications.xml    |  8 +++
 ...panel_region_terrain_texture_transform.xml | 37 ++++++++++++
 .../de/panel_settings_terrain_elevation.xml   | 56 +++++++++++++++++++
 .../de/panel_settings_terrain_transform.xml   | 50 +++++++++++++++++
 5 files changed, 151 insertions(+), 1 deletion(-)
 create mode 100644 indra/newview/skins/default/xui/de/panel_region_terrain_texture_transform.xml
 create mode 100644 indra/newview/skins/default/xui/de/panel_settings_terrain_elevation.xml
 create mode 100644 indra/newview/skins/default/xui/de/panel_settings_terrain_transform.xml

diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 86e2a1d198..3c03868004 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -475,7 +475,6 @@
 		<menu label="GLTF" name="GLTF">
 			<menu_item_call label="Öffnen..." name="Open..."/>
 			<menu_item_call label="Speichern unter..." name="Save As..."/>
-			<menu_item_call label="Trennen..." name="Decompose..."/>
 			<menu_item_call label="Hochladen..." name="Upload..."/>
 		</menu>
 		<menu label="Auflösung" name="Video">
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 00af28f58f..1b3c254f02 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -5088,6 +5088,14 @@ Möchten Sie fortfahren?
 		Sie müssen ein Objekt auswählen, das als Ankerpunkt für den GLTF-Gegenstand fungiert, den Sie vorschauen möchten.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="GLTFLoadFailed">
+		GLTF-Datei konnte nicht geladen werden. Bitte prüfen Sie die Log-Datei für Details.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="GLTFSaveFailed">
+		GLTF-Datei konnte nicht gespeichert werden. Bitte prüfen Sie die Log-Datei für Details.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="GLTFSaveSelection">
 		Sie müssen ein Objekt auswählen, das mit einem GLTF-Gegenstand verknüpft ist.
 		<usetemplate name="okbutton" yestext="OK"/>
diff --git a/indra/newview/skins/default/xui/de/panel_region_terrain_texture_transform.xml b/indra/newview/skins/default/xui/de/panel_region_terrain_texture_transform.xml
new file mode 100644
index 0000000000..897b1cc3bf
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_region_terrain_texture_transform.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Terrain" name="Terrain">
+	<text name="region_text_lbl">
+		Region:
+	</text>
+	<text name="region_text">
+		unbekannt
+	</text>
+	<text name="detail_texture_text">
+		Terrain-Texturen
+	</text>
+	<text name="detail_material_text">
+		Terrain-Materialien
+	</text>
+	<check_box label="PBR metallische Unebenheit" name="terrain_material_type" tool_tip="Falls aktiviert, wird PBR metallische Unebenheit Materialien für Terrain verwendet. Ansonsten werden Texturen verwendet."/>
+	<text name="height_text_lbl">
+		1 (Niedrig)
+	</text>
+	<text name="height_text_lbl2">
+		2
+	</text>
+	<text name="height_text_lbl3">
+		3
+	</text>
+	<text name="height_text_lbl4">
+		4 (Hoch)
+	</text>
+	<layout_stack name="terrain_features_stack">
+		<layout_panel name="frame_settings_terrain">
+			<tab_container name="terrain_tabs">
+				<panel label="Erhebung" name="terrain_elevation_panel" />
+				<panel label="Transformationen" name="terrain_transform_panel" />
+			</tab_container>
+		</layout_panel>
+	</layout_stack>
+	<button label="Anwenden" name="apply_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_settings_terrain_elevation.xml b/indra/newview/skins/default/xui/de/panel_settings_terrain_elevation.xml
new file mode 100644
index 0000000000..964600e51d
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_settings_terrain_elevation.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Erhebung" name="panel_settings_terrain_elevation">
+	<spinner label="Wasser-Höhe" name="water_height_spin"/>
+	<spinner label="Terrain Höhen-Limit" name="terrain_raise_spin"/>
+	<spinner label="Terrain Tiefen-Limit" name="terrain_lower_spin"/>
+	<text name="height_text_lbl5">
+		Textur Erhebungsbereich
+	</text>
+	<text name="height_text_lbl5_material">
+		Material Erhebungsbereich
+	</text>
+	<text name="height_text_lbl10">
+		Diese Werte sind der Überblend- bereich für obige Texturen.
+	</text>
+	<text name="height_text_lbl10_material">
+		Diese Werte spiegeln den Überblendbereich für obige Materialien wider.
+	</text>
+	<text name="height_text_lbl11">
+		Gemessen in Metern ist der NIEDRIGE Wert die MAXIMALE Höhe von Textur #1 und der HOHE Wert die MINIMALE Höhe von Textur #4.
+	</text>
+	<text name="height_text_lbl11_material">
+		Gemessen in Metern ist der NIEDRIGE Wert die MAXIMALE Höhe von Material #1 und der HOHE Wert die MINIMALE Höhe von Material #4.
+	</text>
+	<text name="height_text_lbl6">
+		Nordwest
+	</text>
+	<text name="height_text_lbl7">
+		Nordost
+	</text>
+	<!--  northwest low-->
+	<spinner label="Niedr." name="height_start_spin_1"/>
+	<!--    northeast low-->
+	<spinner label="Niedr." name="height_start_spin_3"/>
+	<!--  northwest high-->
+	<spinner label="Hoch" name="height_range_spin_1"/>
+	<!--  northeast high-->
+	<spinner label="Hoch" name="height_range_spin_3"/>
+	<text name="height_text_lbl8">
+		Südwest
+	</text>
+	<text name="height_text_lbl9">
+		Südost
+	</text>
+	<!--  southwest low-->
+	<spinner label="Niedr." name="height_start_spin_0"/>
+	<!--  southeast low-->
+	<spinner label="Niedr." name="height_start_spin_2"/>
+	<!--southwest high-->
+	<spinner label="Hoch" name="height_range_spin_0"/>
+	<!--  southeast high-->
+	<spinner label="Hoch" name="height_range_spin_2"/>
+	<!-- Terrain Download/Upload/Bake buttons -->
+	<button label="RAW-Terrain herunterladen..." name="download_raw_btn" tool_tip="Nur verfügbar für Estate-Eigentümer, nicht Manager"/>
+	<button label="RAW-Terrain hochladen..." name="upload_raw_btn" tool_tip="Nur verfügbar für Estate-Eigentümer, nicht Manager"/>
+	<button label="Terrain backen" name="bake_terrain_btn" tool_tip="Setzt das aktuelle Terrain als Mittelpoint für Höhen-/Tiefen-Limits"/>
+</panel>
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
new file mode 100644
index 0000000000..5b34396801
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_settings_terrain_transform.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Samping" name="panel_settings_terrain_transform">
+	<text name="terrain0_label">
+		1
+	</text>
+	<text name="terrain1_label">
+		2
+	</text>
+	<text name="terrain2_label">
+		3
+	</text>
+	<text name="terrain3_label">
+		4
+	</text>
+	<text name="terrain0ScaleU_label">
+		Skalierung u
+	</text>
+	<spinner label="Skalierung u" name="terrain0ScaleU"/>
+	<spinner label="Skalierung u" name="terrain1ScaleU"/>
+	<spinner label="Skalierung u" name="terrain2ScaleU"/>
+	<spinner label="Skalierung u" name="terrain3ScaleU"/>
+	<text name="terrain0ScaleV_label">
+		Skalierung v
+	</text>
+	<spinner label="Skalierung v" name="terrain0ScaleV"/>
+	<spinner label="Skalierung u" name="terrain1ScaleV"/>
+	<spinner label="Skalierung u" name="terrain2ScaleV"/>
+	<spinner label="Skalierung u" name="terrain3ScaleV"/>
+	<text name="terrain0Rotation_label">
+		Rotation
+	</text>
+	<spinner label="Rotation" name="terrain0Rotation"/>
+	<spinner label="Skalierung u" name="terrain1Rotation"/>
+	<spinner label="Skalierung u" name="terrain2Rotation"/>
+	<spinner label="Skalierung u" name="terrain3Rotation"/>
+	<text name="terrain0OffsetU_label">
+		Versatz y
+	</text>
+	<spinner label="Versatz u" name="terrain0OffsetU"/>
+	<spinner label="Skalierung u" name="terrain1OffsetU"/>
+	<spinner label="Skalierung u" name="terrain2OffsetU"/>
+	<spinner label="Skalierung u" name="terrain3OffsetU"/>
+	<text name="terrain0OffsetV_label">
+		Versatz v
+	</text>
+	<spinner label="Versatz v" name="terrain0OffsetV"/>
+	<spinner label="Skalierung u" name="terrain1OffsetV"/>
+	<spinner label="Skalierung u" name="terrain2OffsetV"/>
+	<spinner label="Skalierung u" name="terrain3OffsetV"/>
+</panel>

From f1f7426d5436bd019213fb9d086f513688ee5fe1 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Tue, 9 Jul 2024 15:36:00 -0500
Subject: [PATCH 2/4] #1826 Fix for LL_ERRS crashing in mutex lock

---
 indra/llcommon/llerror.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index a45bc32028..fa24c2eaf4 100644
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -55,6 +55,7 @@
 #include "llsingleton.h"
 #include "llstl.h"
 #include "lltimer.h"
+#include <boost/fiber/recursive_mutex.hpp>
 
 // On Mac, got:
 // #error "Boost.Stacktrace requires `_Unwind_Backtrace` function. Define
@@ -506,7 +507,7 @@ namespace
         LLError::TimeFunction               mTimeFunction;
 
         Recorders                           mRecorders;
-        LLCoros::Mutex                      mRecorderMutex;
+        boost::fibers::recursive_mutex      mRecorderMutex;
 
         int                                 mShouldLogCallCounter;
 
@@ -1044,7 +1045,7 @@ namespace LLError
             return;
         }
         SettingsConfigPtr s = Globals::getInstance()->getSettingsConfig();
-        LLCoros::LockType lock(s->mRecorderMutex);
+        std::unique_lock<boost::fibers::recursive_mutex> lock(s->mRecorderMutex);
         s->mRecorders.push_back(recorder);
     }
 
@@ -1055,7 +1056,7 @@ namespace LLError
             return;
         }
         SettingsConfigPtr s = Globals::getInstance()->getSettingsConfig();
-        LLCoros::LockType lock(s->mRecorderMutex);
+        std::unique_lock<boost::fibers::recursive_mutex> lock(s->mRecorderMutex);
         s->mRecorders.erase(std::remove(s->mRecorders.begin(), s->mRecorders.end(), recorder),
                             s->mRecorders.end());
     }
@@ -1104,7 +1105,7 @@ namespace LLError
     std::shared_ptr<RECORDER> findRecorder()
     {
         SettingsConfigPtr s = Globals::getInstance()->getSettingsConfig();
-        LLCoros::LockType lock(s->mRecorderMutex);
+        std::unique_lock<boost::fibers::recursive_mutex> lock(s->mRecorderMutex);
         return findRecorderPos<RECORDER>(s).first;
     }
 
@@ -1115,7 +1116,7 @@ namespace LLError
     bool removeRecorder()
     {
         SettingsConfigPtr s = Globals::getInstance()->getSettingsConfig();
-        LLCoros::LockType lock(s->mRecorderMutex);
+        std::unique_lock<boost::fibers::recursive_mutex> lock(s->mRecorderMutex);
         auto found = findRecorderPos<RECORDER>(s);
         if (found.first)
         {
@@ -1221,7 +1222,7 @@ namespace
 
         std::string escaped_message;
 
-        LLCoros::LockType lock(s->mRecorderMutex);
+        std::unique_lock<boost::fibers::recursive_mutex> lock(s->mRecorderMutex);
         for (LLError::RecorderPtr& r : s->mRecorders)
         {
             if (!r->enabled())

From d9782cf9660bd08b2577d79b29e93129c838de3b Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Tue, 9 Jul 2024 15:53:06 -0500
Subject: [PATCH 3/4] Review feedback change

---
 indra/llcommon/llerror.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index fa24c2eaf4..fa24987d1c 100644
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -1045,7 +1045,7 @@ namespace LLError
             return;
         }
         SettingsConfigPtr s = Globals::getInstance()->getSettingsConfig();
-        std::unique_lock<boost::fibers::recursive_mutex> lock(s->mRecorderMutex);
+        std::unique_lock lock(s->mRecorderMutex);
         s->mRecorders.push_back(recorder);
     }
 
@@ -1056,7 +1056,7 @@ namespace LLError
             return;
         }
         SettingsConfigPtr s = Globals::getInstance()->getSettingsConfig();
-        std::unique_lock<boost::fibers::recursive_mutex> lock(s->mRecorderMutex);
+        std::unique_lock lock(s->mRecorderMutex);
         s->mRecorders.erase(std::remove(s->mRecorders.begin(), s->mRecorders.end(), recorder),
                             s->mRecorders.end());
     }
@@ -1105,7 +1105,7 @@ namespace LLError
     std::shared_ptr<RECORDER> findRecorder()
     {
         SettingsConfigPtr s = Globals::getInstance()->getSettingsConfig();
-        std::unique_lock<boost::fibers::recursive_mutex> lock(s->mRecorderMutex);
+        std::unique_lock lock(s->mRecorderMutex);
         return findRecorderPos<RECORDER>(s).first;
     }
 
@@ -1116,7 +1116,7 @@ namespace LLError
     bool removeRecorder()
     {
         SettingsConfigPtr s = Globals::getInstance()->getSettingsConfig();
-        std::unique_lock<boost::fibers::recursive_mutex> lock(s->mRecorderMutex);
+        std::unique_lock lock(s->mRecorderMutex);
         auto found = findRecorderPos<RECORDER>(s);
         if (found.first)
         {
@@ -1222,7 +1222,7 @@ namespace
 
         std::string escaped_message;
 
-        std::unique_lock<boost::fibers::recursive_mutex> lock(s->mRecorderMutex);
+        std::unique_lock lock(s->mRecorderMutex);
         for (LLError::RecorderPtr& r : s->mRecorders)
         {
             if (!r->enabled())

From d730e31e6ea6305c8911d494a72f4e2ac3a6c823 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 10 Jul 2024 11:12:02 +0200
Subject: [PATCH 4/4] Build fix

---
 indra/newview/llviewertexture.cpp | 57 ++-----------------------------
 1 file changed, 3 insertions(+), 54 deletions(-)

diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index 9b6721064e..503fd597a6 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -109,6 +109,7 @@ U32 LLViewerTexture::sMaxSmallImageSize = MAX_CACHED_RAW_IMAGE_AREA;
 bool LLViewerTexture::sFreezeImageUpdates = false;
 F32 LLViewerTexture::sCurrentTime = 0.0f;
 
+constexpr F32 MEMORY_CHECK_WAIT_TIME = 1.0f;
 constexpr F32 MIN_VRAM_BUDGET = 768.f;
 F32 LLViewerTexture::sFreeVRAMMegabytes = MIN_VRAM_BUDGET;
 
@@ -507,58 +508,6 @@ void LLViewerTexture::initClass()
 F32 texmem_lower_bound_scale = 0.85f;
 F32 texmem_middle_bound_scale = 0.925f;
 
-//static
-bool LLViewerTexture::isMemoryForTextureLow()
-{
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE;
-    // <FS:ND> Disable memory checking on request
-    static LLCachedControl<bool> FSDisableMemCheck(gSavedSettings, "FSDisableAMDTextureMemoryCheck");
-    if (FSDisableMemCheck)
-        return false;
-    // </FS:ND>
-
-    // Note: we need to figure out a better source for 'min' values,
-    // what is free for low end at minimal settings is 'nothing left'
-    // for higher end gpus at high settings.
-    const S32Megabytes MIN_FREE_TEXTURE_MEMORY(20);
-    const S32Megabytes MIN_FREE_MAIN_MEMORY(100);
-
-    S32Megabytes gpu;
-    S32Megabytes physical;
-    getGPUMemoryForTextures(gpu, physical);
-
-    return (gpu < MIN_FREE_TEXTURE_MEMORY); // || (physical < MIN_FREE_MAIN_MEMORY);
-}
-
-//static
-void LLViewerTexture::getGPUMemoryForTextures(S32Megabytes &gpu, S32Megabytes &physical)
-{
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE;
-    static LLFrameTimer timer;
-
-    static S32Megabytes gpu_res = S32Megabytes(S32_MAX);
-    static S32Megabytes physical_res = S32Megabytes(S32_MAX);
-
-    if (timer.getElapsedTimeF32() < GPU_MEMORY_CHECK_WAIT_TIME) //call this once per second.
-    {
-        gpu = gpu_res;
-        physical = physical_res;
-        return;
-    }
-    timer.reset();
-
-    {
-        gpu_res = (S32Megabytes)gViewerWindow->getWindow()->getAvailableVRAMMegabytes();
-
-        //check main memory, only works for windows and macos.
-        LLMemory::updateMemoryInfo();
-        physical_res = LLMemory::getAvailableMemKB();
-
-        gpu = gpu_res;
-        physical = physical_res;
-    }
-}
-
 // <FS:Ansariel> Restrict texture memory by available physical system memory
 static bool isSystemMemoryForTextureLow()
 {
@@ -568,7 +517,7 @@ static bool isSystemMemoryForTextureLow()
     static LLCachedControl<S32> fs_min_free_main_memory(gSavedSettings, "FSMinFreeMainMemoryTextureDiscardThreshold");
     const S32Megabytes MIN_FREE_MAIN_MEMORY(fs_min_free_main_memory);
 
-    if (timer.getElapsedTimeF32() < GPU_MEMORY_CHECK_WAIT_TIME) //call this once per second.
+    if (timer.getElapsedTimeF32() < MEMORY_CHECK_WAIT_TIME) //call this once per second.
     {
         return physical_res < MIN_FREE_MAIN_MEMORY;
     }
@@ -624,7 +573,7 @@ void LLViewerTexture::updateClass()
     if (isSystemMemoryForTextureLow())
     {
         // System RAM is low -> ramp up discard bias over time to free memory
-        if (sEvaluationTimer.getElapsedTimeF32() > GPU_MEMORY_CHECK_WAIT_TIME)
+        if (sEvaluationTimer.getElapsedTimeF32() > MEMORY_CHECK_WAIT_TIME)
         {
             sDesiredDiscardBias += llmax(.1f, over_pct); // add at least 10% over-percentage
             sEvaluationTimer.reset();