aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/hippogridmanager.cpp
diff options
context:
space:
mode:
authorDavid Seikel2011-01-18 11:04:06 +1000
committerDavid Seikel2011-01-18 11:04:06 +1000
commit92d51b498d83e7ab917d53a47b566707adc088bf (patch)
treefb28408c90b256de3a720a1dfc858a80959442ed /linden/indra/newview/hippogridmanager.cpp
parentSet the Grid Manager to not show by default, but make it configurable and tog... (diff)
downloadmeta-impy-92d51b498d83e7ab917d53a47b566707adc088bf.zip
meta-impy-92d51b498d83e7ab917d53a47b566707adc088bf.tar.gz
meta-impy-92d51b498d83e7ab917d53a47b566707adc088bf.tar.bz2
meta-impy-92d51b498d83e7ab917d53a47b566707adc088bf.tar.xz
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.
Diffstat (limited to 'linden/indra/newview/hippogridmanager.cpp')
-rw-r--r--linden/indra/newview/hippogridmanager.cpp3
1 files changed, 3 insertions, 0 deletions
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)
752 752
753void HippoGridManager::setDefaultGrid(const std::string& grid) 753void HippoGridManager::setDefaultGrid(const std::string& grid)
754{ 754{
755 return;
756 /* Prevent setting the default grid to anything but meta7 (except by editing the settings file).
755 GridIterator it = mGridInfo.find(grid); 757 GridIterator it = mGridInfo.find(grid);
756 if (it != mGridInfo.end()) 758 if (it != mGridInfo.end())
757 { 759 {
@@ -769,6 +771,7 @@ void HippoGridManager::setDefaultGrid(const std::string& grid)
769 { 771 {
770 mDefaultGrid = ""; 772 mDefaultGrid = "";
771 } 773 }
774 */
772} 775}
773 776
774 777