2 files changed, 5 insertions, 2 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 9d5efbf..4c822bf 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -574,7 +574,7 @@
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <string>http://imprudenceviewer.org/app/grids/</string>
+    <string>http://www.meta7.com/grids.xml</string>
   </map>
   <key>GoAction</key>
   <map>
@@ -1361,7 +1361,7 @@
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <string>osgrid</string>
+    <string>meta7</string>
   </map>
   <key>KeepAppearance</key>
   <map>
diff --git a/linden/indra/newview/hippogridmanager.cpp b/linden/indra/newview/hippogridmanager.cpp
index d56214c..5e13ed8 100644
--- a/linden/indra/newview/hippogridmanager.cpp
+++ b/linden/indra/newview/hippogridmanager.cpp
@@ -752,6 +752,8 @@ void HippoGridManager::deleteGrid(const std::string& grid)
 
 void HippoGridManager::setDefaultGrid(const std::string& grid)
 {
+        return;
+        /* Prevent setting the default grid to anything but meta7 (except by editing the settings file).
         GridIterator it = mGridInfo.find(grid);
         if (it != mGridInfo.end()) 
         {
@@ -769,6 +771,7 @@ void HippoGridManager::setDefaultGrid(const std::string& grid)
         {
                 mDefaultGrid = "";
         }
+        */
 }