summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcosmic-linden <111533034+cosmic-linden@users.noreply.github.com>2024-04-03 13:45:12 -0700
committerGitHub <noreply@github.com>2024-04-03 13:45:12 -0700
commita9b61c90e74f17a5ba76e71f046b52a83a04197e (patch)
tree2662c9dc243d8458076e43000fb5379e8815904a
parent54fc10acb10eeaeeadec3f06a373e9c94d8676cb (diff)
parente2da41a75901ec2b0a97a92721043737b2bc057c (diff)
Merge pull request #1133 from secondlife/v-773
secondlife/viewer#773: Improve documentation for RenderTerrainPBREnabled
-rw-r--r--doc/testplans/pbr_terrain_composition.md7
-rw-r--r--indra/newview/app_settings/settings.xml2
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/testplans/pbr_terrain_composition.md b/doc/testplans/pbr_terrain_composition.md
index 1cd26a0ded..aadd97a94b 100644
--- a/doc/testplans/pbr_terrain_composition.md
+++ b/doc/testplans/pbr_terrain_composition.md
@@ -12,6 +12,13 @@ All tests in this section assume the PBR terrain feature flag is enabled, and th
### Feature Availability
+On the client, the advanced setting `RenderTerrainPBREnabled` is the PBR terrain feature flag.
+
+The PBR terrain feature flag should be set automatically when logging in/teleporting to a new region.
+
+- The flag should be enabled on regions where the PBR terrain feature is enabled
+- Otherwise the flag should be disabled
+
When the PBR terrain feature flag is disabled:
- The "PBR Metallic Roughness" checkbox should not be visible
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 30b307677b..0ed4b629bb 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10913,7 +10913,7 @@
<key>RenderTerrainPBREnabled</key>
<map>
<key>Comment</key>
- <string>EXPERIMENTAL: Enable PBR Terrain features. Requires restart.</string>
+ <string>EXPERIMENTAL: Enable PBR Terrain features.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>