livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

secondlife/viewer#1885: Terrain texture repeats: Remove feature flag dependency on simulator feature in favor of cap

master
Cosmic Linden 2024-07-02 14:19:45 -07:00
parent e32f6426d5
commit e0b75e3366
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/settings.xml
View File

@ -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>

6
indra/newview/llviewerregion.cpp
View File

@ -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
{