2 files changed, 70 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..13293cf
--- /dev/null
+++ b/linden/indra/newview/app_settings/default_grids.xml
@@ -0,0 +1,37 @@
+<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>
+
+    <!-- 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>localhost</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 087c92f..efe32e7 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -10762,5 +10762,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>