summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorEuclid Linden <euclid@lindenlab.com>2021-03-02 22:41:49 +0000
committerEuclid Linden <euclid@lindenlab.com>2021-03-02 22:41:49 +0000
commita0b9fd6eb0dacfec30df0caac8dbbd7c25366c72 (patch)
tree229a96783c6534a36ce48bdb83108ce26ac24b2f /indra/newview/app_settings/settings.xml
parent2cad61d76ba48fe2adfda120bc21ca66166b7385 (diff)
parent10241c5596402a145e4087c36014d84507183c32 (diff)
Merged in DV528-merge-6.4.15 (pull request #484)
DRTVWR-528 merge up to 6.4.15
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r--indra/newview/app_settings/settings.xml81
1 files changed, 35 insertions, 46 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index e7ec4f1f9a..2f7b261a98 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1362,6 +1362,39 @@
<key>Value</key>
<integer>23</integer>
</map>
+ <key>EnableCacheDebugInfo</key>
+ <map>
+ <key>Comment</key>
+ <string>When set, display additional cache debugging information</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
+ <key>DiskCachePercentOfTotal</key>
+ <map>
+ <key>Comment</key>
+ <string>The percent of total cache size (defined by CacheSize) to use for the disk cache</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>20.0</real>
+ </map>
+ <key>DiskCacheDirName</key>
+ <map>
+ <key>Comment</key>
+ <string>The name of the disk cache (within the standard Viewer disk cache directory)</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>String</string>
+ <key>Value</key>
+ <string>cache</string>
+ </map>
<key>CacheLocation</key>
<map>
<key>Comment</key>
@@ -2835,17 +2868,6 @@
<key>Value</key>
<integer>-1</integer>
</map>
- <key>DebugStatModeVFSPendingOps</key>
- <map>
- <key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>-1</integer>
- </map>
<key>DebugStatModeTimeDialation</key>
<map>
<key>Comment</key>
@@ -3638,17 +3660,6 @@
<key>Value</key>
<integer>4</integer>
</map>
- <key>DumpVFSCaches</key>
- <map>
- <key>Comment</key>
- <string>Dump VFS caches on startup.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
<key>DynamicCameraStrength</key>
<map>
<key>Comment</key>
@@ -11580,7 +11591,7 @@
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
- </map>
+ </map>
<key>NearbyListShowMap</key>
<map>
<key>Comment</key>
@@ -14258,28 +14269,6 @@
<key>Value</key>
<string/>
</map>
- <key>VFSOldSize</key>
- <map>
- <key>Comment</key>
- <string>[DO NOT MODIFY] Controls resizing of local file cache</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>U32</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>VFSSalt</key>
- <map>
- <key>Comment</key>
- <string>[DO NOT MODIFY] Controls local file caching behavior</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>U32</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
<key>VelocityInterpolate</key>
<map>
<key>Comment</key>
@@ -16621,7 +16610,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>1</integer>
</map>
</map>
</llsd>