From ef92508aa1679b713661aeb0cabba1a97501d874 Mon Sep 17 00:00:00 2001
From: "Justin C. Rounds (Chuck)" <chuck@lindenlab.com>
Date: Tue, 1 Dec 2009 18:00:16 -0500
Subject: Adjusted the value of UILineEditorVPad to give more room for text in
 text fields.

---
 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 63e17058e8..e69adad190 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9260,7 +9260,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


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


From de9273d80b15ba3cd3bdd2c4f9d6801f4f359238 Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Thu, 3 Dec 2009 09:16:29 +0800
Subject: EXT-2854 Replace instances in the viewer with the final search
 maturity names

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

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index e69adad190..d9607e5f6b 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -7967,7 +7967,7 @@
     <key>ShowPGSearchAll</key>    
     <map>
       <key>Comment</key>
-      <string>Display results of search All that are flagged as PG</string>
+      <string>Display results of search All that are flagged as general</string>
       <key>Persist</key>
       <integer>1</integer>
 	  <key>HideFromEditor</key>
@@ -7980,7 +7980,7 @@
     <key>ShowMatureSearchAll</key>
     <map>
       <key>Comment</key>
-      <string>Display results of search All that are flagged as mature</string>
+      <string>Display results of search All that are flagged as moderate</string>
       <key>Persist</key>
       <integer>1</integer>
 	  <key>HideFromEditor</key>
@@ -8006,7 +8006,7 @@
     <key>ShowPGGroups</key>
     <map>
       <key>Comment</key>
-      <string>Display results of find groups that are flagged as PG</string>
+      <string>Display results of find groups that are flagged as general</string>
       <key>Persist</key>
       <integer>1</integer>
 	  <key>HideFromEditor</key>
@@ -8019,7 +8019,7 @@
     <key>ShowMatureGroups</key>
     <map>
       <key>Comment</key>
-      <string>Display results of find groups that are flagged as mature</string>
+      <string>Display results of find groups that are flagged as moderate</string>
       <key>Persist</key>
       <integer>1</integer>
 	  <key>HideFromEditor</key>
@@ -8045,7 +8045,7 @@
     <key>ShowPGClassifieds</key>
     <map>
       <key>Comment</key>
-      <string>Display results of find classifieds that are flagged as PG</string>
+      <string>Display results of find classifieds that are flagged as general</string>
       <key>Persist</key>
       <integer>1</integer>
 	  <key>HideFromEditor</key>
@@ -8058,7 +8058,7 @@
     <key>ShowMatureClassifieds</key>
     <map>
       <key>Comment</key>
-      <string>Display results of find classifieds that are flagged as mature</string>
+      <string>Display results of find classifieds that are flagged as moderate</string>
       <key>Persist</key>
       <integer>1</integer>
 	  <key>HideFromEditor</key>
@@ -8084,7 +8084,7 @@
     <key>ShowPGEvents</key>
     <map>
       <key>Comment</key>
-      <string>Display results of find events that are flagged as PG</string>
+      <string>Display results of find events that are flagged as general</string>
       <key>Persist</key>
       <integer>1</integer>
 	  <key>HideFromEditor</key>
@@ -8097,7 +8097,7 @@
     <key>ShowMatureEvents</key>
     <map>
       <key>Comment</key>
-      <string>Display results of find events that are flagged as mature</string>
+      <string>Display results of find events that are flagged as moderate</string>
       <key>Persist</key>
       <integer>1</integer>
 	  <key>HideFromEditor</key>
@@ -8123,7 +8123,7 @@
     <key>ShowPGLand</key>
     <map>
       <key>Comment</key>
-      <string>Display results of find land sales that are flagged as PG</string>
+      <string>Display results of find land sales that are flagged as general</string>
       <key>Persist</key>
       <integer>1</integer>
 	  <key>HideFromEditor</key>
@@ -8136,7 +8136,7 @@
     <key>ShowMatureLand</key>
     <map>
       <key>Comment</key>
-      <string>Display results of find land sales that are flagged as mature</string>
+      <string>Display results of find land sales that are flagged as moderate</string>
       <key>Persist</key>
       <integer>1</integer>
 	  <key>HideFromEditor</key>
@@ -8162,7 +8162,7 @@
     <key>ShowPGSims</key>
     <map>
       <key>Comment</key>
-      <string>Display results of find places or find popular that are in PG sims</string>
+      <string>Display results of find places or find popular that are in general sims</string>
       <key>Persist</key>
       <integer>1</integer>
 	  <key>HideFromEditor</key>
@@ -8175,7 +8175,7 @@
     <key>ShowMatureSims</key>
     <map>
       <key>Comment</key>
-      <string>Display results of find places or find popular that are in mature sims</string>
+      <string>Display results of find places or find popular that are in moderate sims</string>
       <key>Persist</key>
       <integer>1</integer>
 	  <key>HideFromEditor</key>
-- 
cgit v1.2.3


From e8196ca93f24644998777da6b2286920c7709cbe Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Thu, 3 Dec 2009 18:38:15 +0800
Subject: EXT-2313 Add auto-close behavior to mini-inspector floater

---
 indra/newview/app_settings/settings.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 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 d9607e5f6b..fb1aac6e95 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3706,7 +3706,18 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>0.15</real>
+      <real>0.5</real>
+    </map> 
+	<key>InspectorShowTime</key>
+    <map>
+      <key>Comment</key>
+      <string>Stay timing for inspectors</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>3.0</real>
     </map> 
     <key>InstallLanguage</key>
     <map>
-- 
cgit v1.2.3