From 9d8b189886ae14800d58f9729d8c8ea9b338ed52 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 2 Dec 2009 14:18:40 +0200
Subject: Implemented normal sub-task EXT-2975 - Make the IM multifloater
 optional.

--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 b0f782622c..76def8120f 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1385,6 +1385,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>ChatWindow</key>
+    <map>
+      <key>Comment</key>
+      <string>Show chat in multiple windows(by default) or in one multi-tabbed window(requires restart)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>CheesyBeacon</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From 69db64ba015da8139608ed42746429688da80d4b Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 2 Dec 2009 16:25:25 -0800
Subject: Fixed UILineEditorVPad which I merged incorrectly.  Good value is 4

---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 6de98642b1..fa4dfe767b 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9271,7 +9271,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <integer>3</integer>
+      <integer>4</integer>
     </map>
     <key>UIMaxComboWidth</key>
     <map>
-- 
cgit v1.2.3