From e0b75e336666a87333dc92becf8411d8bffdaedf Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Tue, 2 Jul 2024 14:19:45 -0700
Subject: [PATCH 1/2] secondlife/viewer#1885: Terrain texture repeats: Remove
 feature flag dependency on simulator feature in favor of cap

---
 indra/newview/app_settings/settings.xml | 2 +-
 indra/newview/llviewerregion.cpp        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index c455b6f5f1..26c043ee97 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9267,7 +9267,7 @@
     <key>RenderTerrainPBREnabled</key>
     <map>
       <key>Comment</key>
-      <string>EXPERIMENTAL: Enable PBR Terrain features.</string>
+      <string>Enable PBR Terrain features.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 39244c8246..f58e9046f8 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -2496,10 +2496,10 @@ void LLViewerRegion::setSimulatorFeatures(const LLSD& sim_features)
                 gSavedSettings.setBOOL("GLTFEnabled", false);
             }
 
-            if (features.has("PBRTerrainTransformsEnabled"))
+            llassert(gAgent.getRegion());
+            if (gAgent.getRegion() && gAgent.getRegion()->isCapabilityAvailable("ModifyRegion"))
             {
-                bool enabled = features["PBRTerrainTransformsEnabled"];
-                gSavedSettings.setBOOL("RenderTerrainPBRTransformsEnabled", enabled);
+                gSavedSettings.setBOOL("RenderTerrainPBRTransformsEnabled", true);
             }
             else
             {

From 95f9946425f34fcee9feb15a5c7dfa1de2452534 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Wed, 10 Jul 2024 11:31:31 -0700
Subject: [PATCH 2/2] secondlife/viewer#1885: Update test plan

---
 doc/testplans/pbr_terrain_composition.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/testplans/pbr_terrain_composition.md b/doc/testplans/pbr_terrain_composition.md
index 731da90aba..c2630d242f 100644
--- a/doc/testplans/pbr_terrain_composition.md
+++ b/doc/testplans/pbr_terrain_composition.md
@@ -44,6 +44,8 @@ The PBR terrain texture transform flag should be set automatically when logging
 
 When the PBR terrain texture transform feature is enabled, the UI of the Terrain tab should be overhauled. Availability of features depends on the type of terrain.
 
+**Known issue:** The Region/Estate floater may have to be closed/reopened a second time in order for the UI overhaul to take effect, after teleporting between regions that do and do not have the feature flag set.
+
 When "PBR Metallic Roughness" is checked:
 
 - There should be a way for the user to change the texture transforms for the terrain in the current region