1 files changed, 60 insertions, 17 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 8212ad5000..5b760566f0 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1044,7 +1044,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <integer>10</integer>
+      <integer>4</integer>
     </map>
     <key>ButtonHeight</key>
     <map>
@@ -1055,7 +1055,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <integer>20</integer>
+      <integer>23</integer>
     </map>
     <key>ButtonHeightSmall</key>
     <map>
@@ -1066,7 +1066,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <integer>16</integer>
+      <integer>23</integer>
     </map>
     <key>ButtonVPad</key>
     <map>
@@ -3587,6 +3587,17 @@
       <key>Value</key>
       <string>http://viewer-help.secondlife.com/[LANGUAGE]/[CHANNEL]/[VERSION]/[TOPIC]</string>
     </map>
+    <key>HomeSidePanelURL</key>
+    <map>
+      <key>Comment</key>
+      <string>URL for the web page to display in the Home side panel</string>
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>http://www.secondlife.com/</string>
+    </map>
     <key>HighResSnapshot</key>
     <map>
       <key>Comment</key>
@@ -3706,7 +3717,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>
@@ -4952,7 +4974,6 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>StartUpToastLifeTime</key>
     <key>NearbyToastFadingTime</key>
     <map>
       <key>Comment</key>
@@ -7978,7 +7999,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>
@@ -7991,7 +8012,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>
@@ -8017,7 +8038,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>
@@ -8030,7 +8051,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>
@@ -8056,7 +8077,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>
@@ -8069,7 +8090,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>
@@ -8095,7 +8116,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>
@@ -8108,7 +8129,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>
@@ -8134,7 +8155,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>
@@ -8147,7 +8168,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>
@@ -8173,7 +8194,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>
@@ -8186,7 +8207,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>
@@ -9900,6 +9921,28 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>UseCircuitCodeMaxRetries</key>
+    <map>
+      <key>Comment</key>
+      <string>Max timeout count for the initial UseCircuitCode message</string>
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <real>3</real>
+    </map>
+    <key>UseCircuitCodeTimeout</key>
+    <map>
+      <key>Comment</key>
+      <string>Timeout duration in seconds for the initial UseCircuitCode message</string>
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>5.0</real>
+    </map>
     <key>UseDebugLogin</key>
     <map>
       <key>Comment</key>