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

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
master
cosmic-linden 2024-07-10 15:47:31 -07:00 committed by GitHub
parent 579a78a8dc 95f9946425
commit e43c4c78b3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/testplans/pbr_terrain_composition.md
View File

@ -44,6 +44,8 @@ The PBR terrain texture transform flag should be set automatically when logging
When the PBR terrain texture transform feature is enabled, the UI of the Terrain tab should be overhauled. Availability of features depends on the type of terrain. When the PBR terrain texture transform feature is enabled, the UI of the Terrain tab should be overhauled. Availability of features depends on the type of terrain.
**Known issue:** The Region/Estate floater may have to be closed/reopened a second time in order for the UI overhaul to take effect, after teleporting between regions that do and do not have the feature flag set.
When "PBR Metallic Roughness" is checked: When "PBR Metallic Roughness" is checked:
- There should be a way for the user to change the texture transforms for the terrain in the current region - There should be a way for the user to change the texture transforms for the terrain in the current region

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

@ -9289,7 +9289,7 @@
<key>RenderTerrainPBREnabled</key> <key>RenderTerrainPBREnabled</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string>EXPERIMENTAL: Enable PBR Terrain features.</string> <string>Enable PBR Terrain features.</string>
<key>Persist</key> <key>Persist</key>
<integer>1</integer> <integer>1</integer>
<key>Type</key> <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); 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", true);
gSavedSettings.setBOOL("RenderTerrainPBRTransformsEnabled", enabled);
} }
else else
{ {