diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-09-19 01:29:22 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-09-19 19:22:48 +0300 |
| commit | ea28e97d85707099ef3cadf7f5632224498af401 (patch) | |
| tree | 3f5e6517f50a942fb191877202d1ae10744eb72f /indra/newview/app_settings/settings.xml | |
| parent | ea8d7cb40501af9b31d784da78aaaf7353af58f3 (diff) | |
| parent | 9241fb80588304f89c035e9811af96172982a8c2 (diff) | |
Merge branch 'main' into marchcat/b-main-sync
# Conflicts:
# indra/newview/llviewertexturelist.cpp
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index e1556e9a1b..72c0888644 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -7194,6 +7194,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>RenderCanUseTerrainBakeShaders</key> + <map> + <key>Comment</key> + <string>Hardware has support for Terrain Bake shaders</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>RenderClass1MemoryBandwidth</key> <map> <key>Comment</key> @@ -9402,7 +9413,7 @@ <key>Comment</key> <string>EXPERIMENTAL: Enable PBR Terrain texture transforms.</string> <key>Persist</key> - <integer>1</integer> + <integer>0</integer> <key>Type</key> <string>Boolean</string> <key>Value</key> |