diff options
| author | Cosmic Linden <cosmic@lindenlab.com> | 2024-07-02 14:19:45 -0700 |
|---|---|---|
| committer | Cosmic Linden <cosmic@lindenlab.com> | 2024-07-10 11:33:49 -0700 |
| commit | e0b75e336666a87333dc92becf8411d8bffdaedf (patch) | |
| tree | cb842322bb57df712739e551b280a57938a51a14 /indra/newview | |
| parent | e32f6426d5b0765272f7c08bbbb6780a2f2e1e0b (diff) | |
secondlife/viewer#1885: Terrain texture repeats: Remove feature flag dependency on simulator feature in favor of cap
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 | ||||
| -rwxr-xr-x | 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 { |