From 6a39149fec72e3a105d7a47b8a9f5aa2a0bfba87 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Tue, 25 May 2010 15:08:36 -0700
Subject: Added configuration setting to send crash reports to configured url
 rather than through the grid.

---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'indra/newview/app_settings/settings.xml')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index f71662a7c8..6dcbb4e57a 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1,6 +1,17 @@
 <?xml version="1.0" ?>
 <llsd>
 <map>
+	<key>CrashHostUrl</key>
+    <map>
+      <key>Comment</key>
+      <string>A URL pointing to a crash report handler; overrides cluster negotiation to locate crash handler.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string />
+    </map>
     <key>AFKTimeout</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From 68bd89ee4df63d62f695f34efe5060e5019b6fee Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Tue, 8 Jun 2010 10:49:58 -0400
Subject: EXT-7504 WIP Force decloud after timeout using lower res textures

Reduced LowResTextures timeout from 3 to 2 minutes.
---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings/settings.xml')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 864a79c38a..251df03a4a 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -583,7 +583,7 @@
       <key>Type</key>
       <string>U32</string>
       <key>Value</key>
-      <integer>180</integer>
+      <integer>120</integer>
     </map>
     <key>AvatarSex</key>
     <map>
-- 
cgit v1.2.3


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/settings.xml')

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


From 0d5da282de9c0891b0af654b2f9b6f0e66204732 Mon Sep 17 00:00:00 2001
From: Vladimir Pchelko <pchelko@productengine.com>
Date: Wed, 9 Jun 2010 13:46:10 +0300
Subject: EXT-7640 FIXED Added new option to viewer avatar height that allows
 users to see their height in either feet or meters

Feature details:

Added new property HeightUnits.
Implemented logic that build TextBox label correctly according to document
https://docs.google.com/a/productengine.com/Doc?docid=0AXxJWUubGIsoZGhqZDcya3JfMWdybXNwdGd0&hl=en -> 'Mockup - Edit Shape'

Reviewed by Vadim Savchuk, Neal Orman, Mike Antipov at https://codereview.productengine.com/secondlife/r/531/

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

(limited to 'indra/newview/app_settings/settings.xml')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 52e987dac9..0af77b6a84 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11428,5 +11428,16 @@
       <key>Value</key>
       <integer>180</integer>
     </map>
+    <key>HeightUnits</key>
+    <map>
+      <key>Comment</key>
+      <string>Determines which metric units are used: 1(TRUE) for meter and 0(FALSE) for foot.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
 </map>
 </llsd>
-- 
cgit v1.2.3