BROKEN logoff/relog crashing inconsistently on various startup states.

2 files changed, 84 insertions, 0 deletions

diff --git a/linden/indra/newview/app_settings/default_grids.xml b/linden/indra/newview/app_settings/default_grids.xml
new file mode 100644
index 0000000..f4feb0c
--- /dev/null
+++ b/linden/indra/newview/app_settings/default_grids.xml
@@ -0,0 +1,51 @@
+<llsd>

+  <array>

+

+    <!--

+        This file contains fallback settings only.

+        The actual list of grids is loaded from a web server.

+    -->

+

+    <map>

+      <key>default_grids_version</key><string>0</string>

+    </map>

+

+    <!-- OSGrid -->

+    <map>

+      <key>gridnick</key><string>osgrid</string>

+      <key>gridname</key><string>OSGrid</string>

+      <key>platform</key><string>OpenSim</string>

+      <key>loginuri</key><string>http://osgrid.org:8002/</string>

+      <key>loginpage</key><string>http://osgrid.org/loginscreen.php</string>

+      <key>helperuri</key><string>http://osgrid.org/</string>

+      <key>website</key><string>http://osgrid.org/</string>

+      <key>support</key><string>http://osgrid.org/</string>

+      <key>register</key><string>http://osgrid.org/index.php?page=create</string>

+      <key>password</key><string>http://osgrid.org/index.php?page=change</string>

+    </map>

+

+    <!-- Second Life -->

+    <map>

+      <key>gridnick</key><string>secondlife</string>

+      <key>gridname</key><string>Second Life</string>

+      <key>platform</key><string>SecondLife</string>

+      <key>loginuri</key><string>https://login.agni.lindenlab.com/cgi-bin/login.cgi</string>

+      <key>loginpage</key><string>http://secondlife.com/app/login/</string>

+      <key>helperuri</key><string>https://secondlife.com/helpers/</string>

+      <key>website</key><string>http://secondlife.com/</string>

+      <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>

+    </map>

+

+    <!-- Local Host -->

+    <map>

+      <key>gridnick</key><string>local</string>

+      <key>gridname</key><string>Local Host</string>

+      <key>platform</key><string>OpenSim</string>

+      <key>loginuri</key><string>http://127.0.0.1:9000/</string>

+      <key>helperuri</key><string>http://127.0.0.1:9000/</string>

+    </map>

+

+  </array>

+</llsd>

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 5c76185..a8d7a08 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -10509,5 +10509,38 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+  <key>DefaultGrid</key>
+  <map>
+    <key>Comment</key>
+    <string>Nickname of the default grid</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>secondlife</string>
+  </map>
+  <key>KeepAppearance</key>
+  <map>
+    <key>Comment</key>
+    <string>Keep appearance across grid teleport</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <string>0</string>
+  </map>
+  <key>CheckForGridUpdates</key>
+  <map>
+    <key>Comment</key>
+    <string>Check for grid info updates on the web server</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
   </map>
 </llsd>