Revert "Update the grid manager to load grids from our meta7 server. Set the default grid to meta7."

This reverts commit 92d51b498d83e7ab917d53a47b566707adc088bf.

We are no longer a meta 7 specific viewer.

2 files changed, 2 insertions, 5 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index b1d5725..40beede 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -634,7 +634,7 @@
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <string>http://www.meta7.com/grids.xml</string>
+    <string>http://imprudenceviewer.org/app/grids/</string>
   </map>
   <key>GoAction</key>
   <map>
@@ -1476,7 +1476,7 @@
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <string>meta7</string>
+    <string>osgrid</string>
   </map>
   <key>KeepAppearance</key>
   <map>
diff --git a/linden/indra/newview/hippogridmanager.cpp b/linden/indra/newview/hippogridmanager.cpp
index 6f28d87..78539f8 100644
--- a/linden/indra/newview/hippogridmanager.cpp
+++ b/linden/indra/newview/hippogridmanager.cpp
@@ -707,8 +707,6 @@ 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()) 
         {
@@ -726,7 +724,6 @@ void HippoGridManager::setDefaultGrid(const std::string& grid)
         {
                 mDefaultGrid = "";
         }
-        */
 }