From b7de450e3d9f691ea99731de73a25dc9b116e733 Mon Sep 17 00:00:00 2001
From: "Justin C. Rounds (Chuck)" <chuck@lindenlab.com>
Date: Tue, 15 Dec 2009 10:12:33 -0500
Subject: Adjusted button label vertical placement and input field text
 vertical placement to match.

---
 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 7ac7a09d56..59252af362 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9303,7 +9303,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <integer>4</integer>
+      <integer>5</integer>
     </map>
     <key>UIMaxComboWidth</key>
     <map>
-- 
cgit v1.2.3


From b76c4399833c202f6cc8a6fb903fee82e8fcd3f3 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Tue, 15 Dec 2009 16:25:11 -0800
Subject: EXT-2649 Replace 'Advanced > Set Away After 30 Minutes' with Away
 time options EXT-2649 [BSI] Confirm on Drop EXT-3416  Can't name a new
 gesture on creation (and renaming is HARD) reviewed by James

---
 indra/newview/app_settings/settings.xml | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(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 59252af362..37b55fdd86 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -8,7 +8,7 @@
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
-      <string>F32</string>
+      <string>S32</string>
       <key>Value</key>
       <real>300.0</real>
     </map>
@@ -45,17 +45,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>AllowIdleAFK</key>
-    <map>
-      <key>Comment</key>
-      <string>Automatically set AFK (away from keyboard) mode when idle</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
     <key>AllowMultipleViewers</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3