From 92d51b498d83e7ab917d53a47b566707adc088bf Mon Sep 17 00:00:00 2001
From: David Seikel
Date: Tue, 18 Jan 2011 11:04:06 +1000
Subject: Update the grid manager to load grids from our meta7 server. Set the
 default grid to meta7. Prevent setting the default grid to anything but meta7
 (except by editing the settings file).

By Tom Meta from his fork.  See the TomsOldWork branch.
---
 linden/indra/newview/app_settings/settings.xml | 4 ++--
 linden/indra/newview/hippogridmanager.cpp      | 3 +++
 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 = "";
 	}
+	*/
 }
 
 
-- 
cgit v1.1