summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-06-08 16:48:47 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-06-08 16:48:47 +0100
commit9d0a5c6e914f07c0ce3653a8196cb12014405c61 (patch)
tree32cb5f6c4c3d96ea4af6d98b0442ab1c40bd3341 /indra/newview/app_settings
parent2f3019d670e8310f00fe4284a7fc09ee59c0f9bf (diff)
parentd17b616b1c94c136254de0bee039cdc87979b44e (diff)
merge from PE's viewer-release
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 251df03a4a..b0211dd85b 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11417,5 +11417,16 @@
<key>Value</key>
<integer>1</integer>
</map>
+ <key>OutfitOperationsTimeout</key>
+ <map>
+ <key>Comment</key>
+ <string>Timeout for outfit related operations.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>S32</string>
+ <key>Value</key>
+ <integer>180</integer>
+ </map>
</map>
</llsd>