diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-07-07 00:59:47 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-07-07 00:59:47 +0300 |
| commit | 7718f3a9a330725d31e51ccc6c6df82b3511a9e8 (patch) | |
| tree | c09a3dac81185aee5f0331d217ae7c724e67bcef /indra/newview/app_settings/settings.xml | |
| parent | 69de29d74e2171a032472f54581b4eceff1ad099 (diff) | |
| parent | c7c8fac310eef7921741b33f815622f9ddcf2247 (diff) | |
Merged in lindenlab/viewer-lynx
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 57a9db9337..70b374969d 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3701,6 +3701,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>QueueInventoryFetchTimeout</key> + <map> + <key>Comment</key> + <string>Max time llcompilequeue will wait for inventory fetch to complete (in seconds)</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <integer>40.0</integer> + </map> <key>FindLandArea</key> <map> <key>Comment</key> |