Merge commit 'mccabe/1.1.0-RC1' into next

1 files changed, 11 insertions, 16 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 01f6add..e7e7303 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -2903,22 +2903,6 @@
         <integer>0</integer>
       </array>
     </map>
-    <key>FloaterHtmlRect</key>
-    <map>
-      <key>Comment</key>
-      <string>Rectangle for HTML window</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Rect</string>
-      <key>Value</key>
-      <array>
-        <integer>100</integer>
-        <integer>460</integer>
-        <integer>370</integer>
-        <integer>100</integer>
-      </array>
-    </map>
     <key>FloaterIMRect</key>
     <map>
       <key>Comment</key>
@@ -3814,6 +3798,17 @@
       <key>Value</key>
       <string>help/index.html</string>
     </map>
+    <key>HelpSupportURL</key>
+    <map>
+      <key>Comment</key>
+      <string>Main URL of support page</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+    <string>http://support.secondlife.com</string>
+  </map>
     <key>HighResSnapshot</key>
     <map>
       <key>Comment</key>