From ee38f7a26407f998352df80b6eb27d416a6a061b Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Wed, 15 Jun 2011 17:44:38 -0500
Subject: Removed Meta7 and WorldSimTerra from default_grids.xml.

Meta7 is definitely gone, WorldSimTerra seems to be, too.
---
 .../indra/newview/app_settings/default_grids.xml   | 32 +---------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/app_settings/default_grids.xml b/linden/indra/newview/app_settings/default_grids.xml
index cd76ea7..c5ef948 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>37</string>
+      <key>default_grids_version</key><string>38</string>
     </map>
 
     <!-- Second Life -->
@@ -62,21 +62,6 @@
       <key>version</key><string>3</string>
     </map>
 
-    <!-- WorldSimTerra -->
-    <map>
-      <key>gridnick</key><string>worldsimterra</string>
-      <key>gridname</key><string>WorldSimTerra</string>
-      <key>platform</key><string>OpenSim</string>
-      <key>loginuri</key><string>http://wsterra.com:8002</string>
-      <key>loginpage</key><string>http://wsterra.com/log.php</string>
-      <key>helperuri</key><string>http://wsterra.com/</string>
-      <key>website</key><string>http://www.worldsimterra.com/</string>
-      <key>support</key><string>http://www.worldsimterra.com/</string>
-      <key>register</key><string>http://www.worldsimterra.com/</string>
-      <key>password</key><string>http://www.worldsimterra.com/</string>
-      <key>version</key><string>0</string>
-    </map>
-
     <!-- Your Alternative Life -->
     <map>
       <key>gridnick</key><string>youralternativelife</string>
@@ -196,21 +181,6 @@
       <key>version</key>   <string>2</string>
     </map> 
 
-    <!-- Meta7 -->
-    <map>
-      <key>gridname</key>  <string>Meta7</string>
-      <key>gridnick</key>  <string>meta7</string>
-      <key>platform</key>  <string>OpenSim</string>
-      <key>loginuri</key>  <string>http://login.meta7.com/</string>
-      <key>loginpage</key> <string>http://api.meta7.com/loginscreen.php</string>
-      <key>helperuri</key> <string>https://secure.meta7.com/</string>
-      <key>password</key>  <string>http://www.meta7.com/resetpass.php</string>
-      <key>register</key>  <string>http://www.meta7.com/register.php</string>
-      <key>support</key>   <string>http://www.meta7.com/support.php</string>
-      <key>website</key>   <string>http://meta7.com/</string>
-      <key>version</key>   <string>0</string>
-    </map>
-
     <!-- ScienceSim -->
     <map>
       <key>gridname</key>  <string>IEEE/ACM ScienceSim Virtual World</string>
-- 
cgit v1.1