From cc7a38d9d135ae29d0252e161a0540d254d2ee0e Mon Sep 17 00:00:00 2001
From: cosmic-linden <111533034+cosmic-linden@users.noreply.github.com>
Date: Thu, 11 Jul 2024 12:18:47 -0700
Subject: Partially revert "secondlife/viewer#1885: Terrain texture repeats:
 Remove feature flag dependency on simulator feature in favor of cap"

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

(limited to 'indra')

diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 96c839d918..25c07a5ff9 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);
             }
 
-            llassert(gAgent.getRegion());
-            if (gAgent.getRegion() && gAgent.getRegion()->isCapabilityAvailable("ModifyRegion"))
+            if (features.has("PBRTerrainTransformsEnabled"))
             {
-                gSavedSettings.setBOOL("RenderTerrainPBRTransformsEnabled", true);
+                bool enabled = features["PBRTerrainTransformsEnabled"];
+                gSavedSettings.setBOOL("RenderTerrainPBRTransformsEnabled", enabled);
             }
             else
             {
-- 
cgit v1.2.3