diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-06-16 15:25:40 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-06-16 15:25:40 +0300 |
| commit | 9cb1fcec6d52933f01426aec4e6a3f1b6774632c (patch) | |
| tree | ac6b0a5ddb280db610162dece01166905d46b60e /indra/newview/app_settings/settings.xml | |
| parent | b9a468aff6b4b9bdaf4ac0ab2a309902c6c203ed (diff) | |
| parent | 9ee5a62332353db6a098628e69732d2723cc5deb (diff) | |
Merge from default branch
--HG--
branch : product-engine
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 f9a1dfb0dc..5b70e4bcb0 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3545,6 +3545,17 @@ <key>Value</key> <real>9.0</real> </map> + <key>ForceAssetFail</key> + <map> + <key>Comment</key> + <string>Force wearable fetches to fail for this asset type.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>U32</string> + <key>Value</key> + <integer>255</integer> + </map> <key>ForceShowGrid</key> <map> <key>Comment</key> @@ -5064,6 +5075,17 @@ <key>Value</key> <real>64.0</real> </map> + <key>MaxWearableWaitTime</key> + <map> + <key>Comment</key> + <string>Max seconds to wait for wearable assets to fetch.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>60.0</real> + </map> <key>MeanCollisionBump</key> <map> <key>Comment</key> @@ -10888,7 +10910,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>UseStartScreen</key> <map> |