Merge commit 'armin/beta2-bugfixes' into 1.3-beta2bugfixes

2 files changed, 1 insertions, 26 deletions

diff --git a/linden/indra/newview/app_settings/default_grids.xml b/linden/indra/newview/app_settings/default_grids.xml
index 13293cf..f11f513 100644
--- a/linden/indra/newview/app_settings/default_grids.xml
+++ b/linden/indra/newview/app_settings/default_grids.xml
@@ -10,20 +10,6 @@
       <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>
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 9c498c2..6643e43 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -6063,17 +6063,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>LoggedIntoOpenSim</key>
-    <map>
-      <key>Comment</key>
-      <string>Check whether or not we're in an OpenSimulator (default 0)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>LoginAsGod</key>
     <map>
       <key>Comment</key>
@@ -12895,7 +12884,7 @@
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <string>secondlife</string>
+    <string>osgrid</string>
   </map>
   <key>KeepAppearance</key>
   <map>