From 50eb27a04d193ef145f8879e12d8a82089a66891 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Tue, 8 Jun 2010 15:36:48 +0300
Subject: EXT-7644 FIXED Implemented functionality for locking outfit
 modification controls and used it for 'save outfit' action. 1 Added
 functionality for locking outfit in LLAppearanceMgr. Outfit should be locked
 when outfit related operation is started(now it is used for updateBaseOutfit)
 and unlocked when operation completed or timeout is exceeded. 2 Added outfit
 saved and outfit lock changed signals to LLOutfitObserver. 3 Updated
 LLPanelOutfitsInventory and LLPanelOutfitEdit with functionality of
 controlling 'save outfit' controls state('save outfit' controls should be
 enabled only if outfit isn't locked and outfit is dirty). 4 Renamed action
 label of method LLPanelOutfitsInventory::isActionEnabled "make_outfit" to
 "save_outfit".

--HG--
branch : product-engine
---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 864a79c38a..52e987dac9 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>
-- 
cgit v1.2.3