summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorGlenn Glazer <coyot@lindenlab.com>2017-06-20 13:46:51 -0700
committerGlenn Glazer <coyot@lindenlab.com>2017-06-20 13:46:51 -0700
commit1054ddf1bac314dea994ca307c71c9df826c573b (patch)
tree0cac32f16df50f49e5fb681f400ae4a377c3c853 /indra/newview/app_settings
parent8205eaa6e3275fec2148286f8e831d18a0e6f22f (diff)
parenta3066b7375a13b61861b554519673dfc24322c22 (diff)
pull from v64 gate
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml20
1 files changed, 20 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index de31425c27..fbc984692d 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -14694,6 +14694,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>AssetStorageLogFrequency</key>
+ <map>
+ <key>Comment</key>
+ <string>Seconds between display of AssetStorage info in log (0 for never)</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>60.0</real>
+ </map>
<key>LogWearableAssetSave</key>
<map>
<key>Comment</key>
@@ -14767,6 +14778,15 @@
<key>Value</key>
<real>1</real>
</map>
+ <key>PoolSizeAssetStorage</key>
+ <map>
+ <key>Comment</key>
+ <string>Coroutine Pool size for AssetStorage requests</string>
+ <key>Type</key>
+ <string>U32</string>
+ <key>Value</key>
+ <real>12</real>
+ </map>
<!-- Settings below are for back compatibility only.
They are not used in current viewer anymore. But they can't be removed to avoid