diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2024-07-10 15:47:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-10 15:47:31 -0700 |
| commit | e43c4c78b39b9208b1e3cdd26c20d9257d4df184 (patch) | |
| tree | 9834f82832563b6e5d5d7a8a8f789ca61e22ce35 /indra/newview | |
| parent | 579a78a8dcbcb98bd181c9262e2288c5cf99febf (diff) | |
| parent | 95f9946425f34fcee9feb15a5c7dfa1de2452534 (diff) | |
Merge pull request #1982 from secondlife/v-1885
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 7f645792a6..4190719504 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -9289,7 +9289,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 25c07a5ff9..96c839d918 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 { |