diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-03-02 14:25:36 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-03-02 14:25:36 -0700 |
| commit | 363bc9d9d0fe4f42b0dfbdb7adeb9a481a4fe55b (patch) | |
| tree | 600cd078a00e80a33504c748540e333a34a4b30d /indra/newview/app_settings/settings.xml | |
| parent | 31bca613a6011f5e1a95cffafd283e445142557f (diff) | |
| parent | 2b385841f3031d599bdb226f0f859e51b09870f8 (diff) | |
Merge branch 'master' v 6.4.15 into DRTVWR-525
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 81 |
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> |