diff options
| author | Callum Prentice <callum@gmail.com> | 2017-07-12 10:56:23 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2017-07-12 10:56:23 -0700 |
| commit | c6c7c7c71da48b60557dbc4b653398dd6343b6fc (patch) | |
| tree | 6711858f93cb0353d44568c4531ba8392990cea2 /indra/newview/app_settings | |
| parent | 07185d300d7879fc4d8d268210fa2c440efe02f4 (diff) | |
| parent | 83cda57b10e1416f2d104941f862f598653c42cb (diff) | |
Automated merge with tip of viewer64
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 20 |
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 |