diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2024-07-11 12:28:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-11 12:28:33 -0700 |
| commit | 85b99328e899d1aa4bdb2702510c4bae37c7ac81 (patch) | |
| tree | 0259b7fbdd49112d82db1b0e5d484fe311cd8b74 | |
| parent | 98941831e4afab1cd5ccb5bab995a671df320f72 (diff) | |
| parent | cc7a38d9d135ae29d0252e161a0540d254d2ee0e (diff) | |
Merge pull request #2002 from secondlife/revert-1982-v-1885
Revert "secondlife/viewer#1885: Terrain texture repeats: Remove feature flag dependency on simulator feature in favor of cap"
| -rwxr-xr-x | indra/newview/llviewerregion.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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 { |