diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-04-01 13:10:33 -0400 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-04-01 13:10:33 -0400 |
| commit | ccdcbfeebd10a78cfb67f5324a3eb17a7d76604b (patch) | |
| tree | 9543eb9393ea9f20b3199c86c48a5b4fc5b3f5e1 /indra/newview/app_settings/settings.xml | |
| parent | 497c309a5b148fd86a0e1429343092f0a6ca2e0d (diff) | |
| parent | 4ddd9d1fefc3b956e19ef25cfdd199fde352437a (diff) | |
Merge branch 'release/2025.03' into release/2025.04
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 86d36b3f29..a2a6744722 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3676,6 +3676,17 @@ <key>Value</key> <integer>5000</integer> </map> + <key>InventoryExposeFolderID</key> + <map> + <key>Comment</key> + <string>Allows copying folder id from context menu</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>MarketplaceListingsSortOrder</key> <map> <key>Comment</key> @@ -7803,7 +7814,7 @@ <key>Type</key> <string>U32</string> <key>Value</key> - <integer>2</integer> + <integer>1</integer> </map> <key>RenderMinFreeMainMemoryThreshold</key> <map> @@ -9076,6 +9087,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>RenderReflectionProbeDynamicAllocation</key> + <map> + <key>Comment</key> + <string>Enable dynamic allocation of reflection probes. -1 means no dynamic allocation. Sets a buffer to allocate when a dynamic allocation occurs otherwise.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>S32</string> + <key>Value</key> + <integer>-1</integer> + </map> <key>RenderReflectionProbeCount</key> <map> <key>Comment</key> |