Merge remote-tracking branch 'mccabe/weekly' into weekly

2 files changed, 29 insertions, 31 deletions

diff --git a/linden/indra/newview/app_settings/default_grids.xml b/linden/indra/newview/app_settings/default_grids.xml
index 3f44e4b..802558a 100644
--- a/linden/indra/newview/app_settings/default_grids.xml
+++ b/linden/indra/newview/app_settings/default_grids.xml
@@ -1,7 +1,7 @@
 <llsd>
   <array>
     <map>
-      <key>default_grids_version</key><string>26</string>
+      <key>default_grids_version</key><string>31</string>
     </map>
 
     <!-- Second Life -->
@@ -16,7 +16,7 @@
       <key>support</key><string>http://secondlife.com/support/</string>
       <key>register</key><string>http://secondlife.com/registration/</string>
       <key>password</key><string>http://secondlife.com/account/request.php</string>
-      <key>version</key><string>0</string>
+      <key>version</key><string>2</string>
     </map>
 
     <!-- Second Life Beta -->
@@ -31,7 +31,7 @@
       <key>support</key><string>http://secondlife.com/support/</string>
       <key>register</key><string>http://secondlife.com/registration/</string>
       <key>password</key><string>http://secondlife.com/account/request.php</string>
-      <key>version</key><string>1</string>
+      <key>version</key><string>3</string>
     </map>
 
     <!-- Local Host -->
@@ -57,22 +57,7 @@
       <key>support</key><string>http://osgrid.org/</string>
       <key>register</key><string>http://www.osgrid.org/index.php/auth/register</string>
       <key>password</key><string>http://www.osgrid.org/index.php/auth/forgot_password</string>
-      <key>version</key><string>1</string>
-    </map>
-
-    <!-- Legend City Online -->
-    <map>
-      <key>gridnick</key><string>legendcityonline</string>
-      <key>gridname</key><string>Legend City Online</string>
-      <key>platform</key><string>OpenSim</string>
-      <key>loginuri</key><string>http://login.legendcityonline.com</string>
-      <key>loginpage</key><string>http://www.legendcityonline.com/welcome.php</string>
-      <key>helperuri</key><string>https://secure.legendcityonline.com/</string>
-      <key>website</key><string>http://www.legendcityonline.com/</string>
-      <key>support</key><string>http://www.legendcityonline.com/</string>
-      <key>register</key><string>http://www.legendcityonline.com/</string>
-      <key>password</key><string>http://www.legendcityonline.com/</string>
-      <key>version</key><string>0</string>
+      <key>version</key><string>2</string>
     </map>
 
     <!-- WorldSimTerra -->
@@ -135,15 +120,17 @@
       <key>version</key><string>0</string>
     </map>
 
-    <!-- Cyberlandia -->
+    <!-- Craft (offspring of Cyberlandia) -->
     <map>
-      <key>gridnick</key><string>cyberlandia</string>
-      <key>gridname</key><string>Cyberlandia</string>
+      <key>gridnick</key><string>craft</string>
+      <key>gridname</key><string>Craft</string>
       <key>platform</key><string>OpenSim</string>
-      <key>loginuri</key><string>http://grid.cyberlandia.net:8002</string>
-      <key>loginpage</key><string></string>
-      <key>helperuri</key><string></string>
-      <key>website</key><string>http://www.cyberlandia.net</string>
+      <key>loginuri</key><string>http://craft-world.org:8002/</string>
+      <key>loginpage</key><string>http://www.craft-world.org/loginscreen.php</string>
+      <key>helperuri</key><string>http://webapp.craft-world.org/</string>
+      <key>website</key><string>http://www.craft-world.org/</string>
+      <key>register</key><string>http://craft-world.org:8002/wifi/user/account/</string>
+      <key>password</key><string>http://craft-world.org:8002/wifi/forgotpassword</string>
       <key>version</key><string>0</string>
     </map>
 
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 2d9d810..ac8b236 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -219,7 +219,7 @@
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <string>http://imprudenceviewer.org</string>
+    <string>http://blog.kokuaviewer.org</string>
   </map>
   <key>BrowserLastVisited</key>
   <map>
@@ -832,6 +832,17 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  <key>NewsBarURL</key>
+  <map>
+    <key>Comment</key>
+    <string>URL to load in the news bar on the login screen</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>http://app.kokuaviewer.org/news/</string>
+  </map>
   <key>ObjectIMColor</key>
   <map>
     <key>Comment</key>
@@ -1369,7 +1380,7 @@
   <key>WarnFirstPrivacy</key>
   <map>
     <key>Comment</key>
-    <string>Enables FirstPrivacy warning on login</string>
+    <string>Warn about statistics packet when first logging in to Second Life.</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -1702,7 +1713,7 @@
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <string>http://imprudenceviewer.org/app/client_list/</string>
+    <string>http://app.kokuaviewer.org/client_list/</string>
   </map>
 
   <key>WarnClientTags</key>
@@ -1967,7 +1978,7 @@
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <string>http://imprudenceviewer.org/app/dics/</string>
+    <string>http://kokuaviewer.org/app/dics/</string>
   </map>
   <key>EmeraldEnableAutoCorrect</key>
   <map>
@@ -7725,7 +7736,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://imprudenceviewer.org/splash/</string>
+      <string></string>
     </map>
     <key>LogTextureDownloadsToViewerLog</key>
     <map>