Automated merge with file:///Users/nat/linden/viewer-sourceid

5 files changed, 443 insertions, 513 deletions

diff --git a/indra/newview/tests/llagentaccess_test.cpp b/indra/newview/tests/llagentaccess_test.cpp
index 0141a219c5..3ba25f3c10 100644
--- a/indra/newview/tests/llagentaccess_test.cpp
+++ b/indra/newview/tests/llagentaccess_test.cpp
@@ -84,19 +84,25 @@ namespace tut
 		LLAgentAccess aa(cgr);
 		
 		cgr.setU32("PreferredMaturity", SIM_ACCESS_PG);
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("1 prefersPG",     aa.prefersPG());
 		ensure("1 prefersMature", !aa.prefersMature());
 		ensure("1 prefersAdult",  !aa.prefersAdult());
+#endif // HACKED_GODLIKE_VIEWER
 		
 		cgr.setU32("PreferredMaturity", SIM_ACCESS_MATURE);
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("2 prefersPG",     !aa.prefersPG());
 		ensure("2 prefersMature", aa.prefersMature());
 		ensure("2 prefersAdult",  !aa.prefersAdult());
+#endif // HACKED_GODLIKE_VIEWER
 		
 		cgr.setU32("PreferredMaturity", SIM_ACCESS_ADULT);
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("3 prefersPG",     !aa.prefersPG());
 		ensure("3 prefersMature", aa.prefersMature());
 		ensure("3 prefersAdult",  aa.prefersAdult());
+#endif // HACKED_GODLIKE_VIEWER
     }
     
 	template<> template<>
@@ -107,33 +113,43 @@ namespace tut
 		LLAgentAccess aa(cgr);
 		
 		// make sure default is PG
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("1 isTeen",     aa.isTeen());
 		ensure("1 isMature",   !aa.isMature());
 		ensure("1 isAdult",    !aa.isAdult());
+#endif // HACKED_GODLIKE_VIEWER
 		
 		// check the conversion routine
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure_equals("1 conversion", SIM_ACCESS_PG, aa.convertTextToMaturity('P'));
 		ensure_equals("2 conversion", SIM_ACCESS_MATURE, aa.convertTextToMaturity('M'));
 		ensure_equals("3 conversion", SIM_ACCESS_ADULT, aa.convertTextToMaturity('A'));
 		ensure_equals("4 conversion", SIM_ACCESS_MIN, aa.convertTextToMaturity('Q'));
+#endif // HACKED_GODLIKE_VIEWER
 		
 		// now try the other method of setting it - PG
 		aa.setMaturity('P');
 		ensure("2 isTeen",     aa.isTeen());
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("2 isMature",   !aa.isMature());
 		ensure("2 isAdult",    !aa.isAdult());
+#endif // HACKED_GODLIKE_VIEWER
 		
 		// Mature
 		aa.setMaturity('M');
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("3 isTeen",     !aa.isTeen());
 		ensure("3 isMature",   aa.isMature());
 		ensure("3 isAdult",    !aa.isAdult());
+#endif // HACKED_GODLIKE_VIEWER
 		
 		// Adult
 		aa.setMaturity('A');
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("4 isTeen",     !aa.isTeen());
 		ensure("4 isMature",   aa.isMature());
 		ensure("4 isAdult",    aa.isAdult());
+#endif // HACKED_GODLIKE_VIEWER
 		
 	}
 
@@ -144,21 +160,35 @@ namespace tut
 		cgr.declareU32("PreferredMaturity", SIM_ACCESS_PG, "declared_for_test", FALSE);
 		LLAgentAccess aa(cgr);
 		
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("starts normal", !aa.isGodlike());
+#endif // HACKED_GODLIKE_VIEWER
 		aa.setGodLevel(GOD_NOT);
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("stays normal", !aa.isGodlike());
+#endif // HACKED_GODLIKE_VIEWER
 		aa.setGodLevel(GOD_FULL);
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("sets full", aa.isGodlike());
+#endif // HACKED_GODLIKE_VIEWER
 		aa.setGodLevel(GOD_NOT);
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("resets normal", !aa.isGodlike());
+#endif // HACKED_GODLIKE_VIEWER
 		aa.setAdminOverride(true);
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("admin true", aa.getAdminOverride());
 		ensure("overrides 1", aa.isGodlike());
+#endif // HACKED_GODLIKE_VIEWER
 		aa.setGodLevel(GOD_FULL);
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("overrides 2", aa.isGodlike());
+#endif // HACKED_GODLIKE_VIEWER
 		aa.setAdminOverride(false);
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("admin false", !aa.getAdminOverride());
 		ensure("overrides 3", aa.isGodlike());
+#endif // HACKED_GODLIKE_VIEWER
     }
     
 	template<> template<>
@@ -168,55 +198,73 @@ namespace tut
 		cgr.declareU32("PreferredMaturity", SIM_ACCESS_PG, "declared_for_test", FALSE);
 		LLAgentAccess aa(cgr);
 		
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("1 pg to start", aa.wantsPGOnly());
 		ensure("2 pg to start", !aa.canAccessMature());
 		ensure("3 pg to start", !aa.canAccessAdult());
+#endif // HACKED_GODLIKE_VIEWER
 		
 		aa.setGodLevel(GOD_FULL);
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("1 full god", !aa.wantsPGOnly());
 		ensure("2 full god", aa.canAccessMature());
 		ensure("3 full god", aa.canAccessAdult());
+#endif // HACKED_GODLIKE_VIEWER
 				
 		aa.setGodLevel(GOD_NOT);
 		aa.setAdminOverride(true);
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("1 admin mode", !aa.wantsPGOnly());
 		ensure("2 admin mode", aa.canAccessMature());
 		ensure("3 admin mode", aa.canAccessAdult());
+#endif // HACKED_GODLIKE_VIEWER
 
 		aa.setAdminOverride(false);
 		aa.setMaturity('M');
 		// preferred is still pg by default
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("1 mature pref pg", aa.wantsPGOnly());
 		ensure("2 mature pref pg", !aa.canAccessMature());
 		ensure("3 mature pref pg", !aa.canAccessAdult());
+#endif // HACKED_GODLIKE_VIEWER
 		
 		cgr.setU32("PreferredMaturity", SIM_ACCESS_MATURE);
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("1 mature", !aa.wantsPGOnly());
 		ensure("2 mature", aa.canAccessMature());
 		ensure("3 mature", !aa.canAccessAdult());
+#endif // HACKED_GODLIKE_VIEWER
 		
 		cgr.setU32("PreferredMaturity", SIM_ACCESS_PG);
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("1 mature pref pg", aa.wantsPGOnly());
 		ensure("2 mature pref pg", !aa.canAccessMature());
 		ensure("3 mature pref pg", !aa.canAccessAdult());
+#endif // HACKED_GODLIKE_VIEWER
 		
 		aa.setMaturity('A');
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("1 adult pref pg", aa.wantsPGOnly());
 		ensure("2 adult pref pg", !aa.canAccessMature());
 		ensure("3 adult pref pg", !aa.canAccessAdult());
+#endif // HACKED_GODLIKE_VIEWER
 
 		cgr.setU32("PreferredMaturity", SIM_ACCESS_ADULT);
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("1 adult", !aa.wantsPGOnly());
 		ensure("2 adult", aa.canAccessMature());
 		ensure("3 adult", aa.canAccessAdult());
+#endif // HACKED_GODLIKE_VIEWER
 
 		// make sure that even if pref is high, if access is low we block access
 		// this shouldn't occur in real life but we want to be safe
 		cgr.setU32("PreferredMaturity", SIM_ACCESS_ADULT);
 		aa.setMaturity('P');
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("1 pref adult, actual pg", aa.wantsPGOnly());
 		ensure("2 pref adult, actual pg", !aa.canAccessMature());
 		ensure("3 pref adult, actual pg", !aa.canAccessAdult());
+#endif // HACKED_GODLIKE_VIEWER
 		
 	}
 
@@ -229,10 +277,14 @@ namespace tut
 		
 		cgr.setU32("PreferredMaturity", SIM_ACCESS_ADULT);
 		aa.setMaturity('M');
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("1 preferred maturity pegged to M when maturity is M", cgr.getU32("PreferredMaturity") == SIM_ACCESS_MATURE);
+#endif // HACKED_GODLIKE_VIEWER
 		
 		aa.setMaturity('P');
+#ifndef HACKED_GODLIKE_VIEWER
 		ensure("1 preferred maturity pegged to P when maturity is P", cgr.getU32("PreferredMaturity") == SIM_ACCESS_PG);
+#endif // HACKED_GODLIKE_VIEWER
 	}
 }
 
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp
index 9e321db889..7705b4c567 100644
--- a/indra/newview/tests/lllogininstance_test.cpp
+++ b/indra/newview/tests/lllogininstance_test.cpp
@@ -60,6 +60,7 @@ static LLEventStream gTestPump("test_pump");
 #include "../llslurl.h"
 #include "../llstartup.h"
 LLSLURL LLStartUp::sStartSLURL;
+LLSLURL& LLStartUp::getStartSLURL() { return sStartSLURL; }
 
 #include "lllogin.h"
 
@@ -114,8 +115,9 @@ LLGridManager::~LLGridManager()
 {
 }
 
-void LLGridManager::addGrid(LLSD& grid_data)
+bool LLGridManager::addGrid(LLSD& grid_data)
 {
+	return true;
 }
 LLGridManager::LLGridManager()
 :
@@ -136,7 +138,7 @@ void LLGridManager::addSystemGrid(const std::string& label,
 								  const std::string& login_id)
 {
 }
-std::map<std::string, std::string> LLGridManager::getKnownGrids(bool favorite_only)
+std::map<std::string, std::string> LLGridManager::getKnownGrids()
 {
 	std::map<std::string, std::string> result;
 	return result;
@@ -151,8 +153,6 @@ bool LLGridManager::isInProductionGrid()
 	return false;
 }
 
-void LLGridManager::saveFavorites()
-{}
 std::string LLGridManager::getSLURLBase(const std::string& grid_name)
 {
 	return "myslurl";
diff --git a/indra/newview/tests/llslurl_test.cpp b/indra/newview/tests/llslurl_test.cpp
index f96f79006a..09343ef227 100644
--- a/indra/newview/tests/llslurl_test.cpp
+++ b/indra/newview/tests/llslurl_test.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llsecapi_test.cpp
  * @author Roxie
  * @date 2009-02-10
@@ -7,21 +7,21 @@
  * $LicenseInfo:firstyear=2009&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -31,8 +31,8 @@
 #include "../llslurl.h"
 #include "../../llxml/llcontrol.h"
 #include "llsdserialize.h"
-//----------------------------------------------------------------------------               
-// Mock objects for the dependencies of the code we're testing                               
+//----------------------------------------------------------------------------
+// Mock objects for the dependencies of the code we're testing
 
 LLControlGroup::LLControlGroup(const std::string& name)
 : LLInstanceTracker<LLControlGroup, std::string>(name) {}
@@ -80,6 +80,39 @@ LLPointer<LLControlVariable> LLControlGroup::getControl(const std::string& name)
 }
 
 LLControlGroup gSavedSettings("test");
+const char *gSampleGridFile =
+	"<?xml version=\"1.0\"?>"
+	"<llsd>"
+	"  <map>"
+	"    <key>foo.bar.com</key>"
+	"    <map>"
+	"      <key>helper_uri</key><string>https://foobar/helpers/</string>"
+	"      <key>label</key><string>Foobar Grid</string>"
+	"      <key>login_page</key><string>foobar/loginpage</string>"
+	"      <key>login_uri</key>"
+	"      <array>"
+	"        <string>foobar/loginuri</string>"
+	"      </array>"
+	"      <key>keyname</key><string>foo.bar.com</string>"
+	"      <key>credential_type</key><string>agent</string>"
+	"      <key>grid_login_id</key><string>FooBar</string>"
+	"    </map>"
+	"    <key>my.grid.com</key>"
+	"    <map>"
+	"      <key>helper_uri</key><string>https://mygrid/helpers/</string>"
+	"      <key>label</key><string>My Grid</string>"
+	"      <key>login_page</key><string>mygrid/loginpage</string>"
+	"      <key>login_uri</key>"
+	"      <array>"
+	"        <string>mygrid/loginuri</string>"
+	"      </array>"
+	"      <key>keyname</key><string>my.grid.com</string>"
+	"      <key>credential_type</key><string>agent</string>"
+	"      <key>grid_login_id</key><string>MyGrid</string>"
+	"    </map>"
+	"  </map>"
+	"</llsd>"
+	;
 
 // -------------------------------------------------------------------------------------------
 // TUT
@@ -90,171 +123,189 @@ namespace tut
 	struct slurlTest
 	{
 		slurlTest()
-		{	
+		{
 			LLGridManager::getInstance()->initialize(std::string(""));
 		}
 		~slurlTest()
 		{
 		}
 	};
-	
+
 	// Tut templating thingamagic: test group, object and test instance
 	typedef test_group<slurlTest> slurlTestFactory;
 	typedef slurlTestFactory::object slurlTestObject;
 	tut::slurlTestFactory tut_test("LLSlurl");
-	
+
 	// ---------------------------------------------------------------------------------------
-	// Test functions 
+	// Test functions
 	// ---------------------------------------------------------------------------------------
 	// construction from slurl string
 	template<> template<>
 	void slurlTestObject::test<1>()
 	{
+		llofstream gridfile("grid_test.xml");
+		gridfile << gSampleGridFile;
+		gridfile.close();
+
+		LLGridManager::getInstance()->initialize("grid_test.xml");
+
 		LLGridManager::getInstance()->setGridChoice("util.agni.lindenlab.com");
-		
+
 		LLSLURL slurl = LLSLURL("");
 		ensure_equals("null slurl", (int)slurl.getType(), LLSLURL::LAST_LOCATION);
-		
+
 		slurl = LLSLURL("http://slurl.com/secondlife/myregion");
 		ensure_equals("slurl.com slurl, region only - type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals("slurl.com slurl, region only", slurl.getSLURLString(), 
+		ensure_equals("slurl.com slurl, region only", slurl.getSLURLString(),
 					  "http://maps.secondlife.com/secondlife/myregion/128/128/0");
-		
+
 		slurl = LLSLURL("http://maps.secondlife.com/secondlife/myregion/1/2/3");
 		ensure_equals("maps.secondlife.com slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals("maps.secondlife.com slurl, region + coords", slurl.getSLURLString(), 
+		ensure_equals("maps.secondlife.com slurl, region + coords", slurl.getSLURLString(),
 					  "http://maps.secondlife.com/secondlife/myregion/1/2/3");
 
 		slurl = LLSLURL("secondlife://myregion");
 		ensure_equals("secondlife: slurl, region only - type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals("secondlife: slurl, region only", slurl.getSLURLString(), 
+		ensure_equals("secondlife: slurl, region only", slurl.getSLURLString(),
 					  "http://maps.secondlife.com/secondlife/myregion/128/128/0");
-		
+
 		slurl = LLSLURL("secondlife://myregion/1/2/3");
 		ensure_equals("secondlife: slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals("secondlife slurl, region + coords", slurl.getSLURLString(), 
+		ensure_equals("secondlife slurl, region + coords", slurl.getSLURLString(),
 					  "http://maps.secondlife.com/secondlife/myregion/1/2/3");
-		
+
 		slurl = LLSLURL("/myregion");
 		ensure_equals("/region slurl, region- type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals("/region slurl, region ", slurl.getSLURLString(), 
+		ensure_equals("/region slurl, region ", slurl.getSLURLString(),
 					  "http://maps.secondlife.com/secondlife/myregion/128/128/0");
-		
+
 		slurl = LLSLURL("/myregion/1/2/3");
 		ensure_equals("/: slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals("/ slurl, region + coords", slurl.getSLURLString(), 
-					  "http://maps.secondlife.com/secondlife/myregion/1/2/3");	
-		
+		ensure_equals("/ slurl, region + coords", slurl.getSLURLString(),
+					  "http://maps.secondlife.com/secondlife/myregion/1/2/3");
+
 		slurl = LLSLURL("my region/1/2/3");
 		ensure_equals(" slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals(" slurl, region + coords", slurl.getSLURLString(), 
-					  "http://maps.secondlife.com/secondlife/my%20region/1/2/3");	
-		
-		LLGridManager::getInstance()->setGridChoice("my.grid.com");		
+		ensure_equals(" slurl, region + coords", slurl.getSLURLString(),
+					  "http://maps.secondlife.com/secondlife/my%20region/1/2/3");
+
+		LLGridManager::getInstance()->setGridChoice("my.grid.com");
 		slurl = LLSLURL("https://my.grid.com/region/my%20region/1/2/3");
 		ensure_equals("grid slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals("grid slurl, region + coords", slurl.getSLURLString(), 
-					  "https://my.grid.com/region/my%20region/1/2/3");	
-		
+		ensure_equals("grid slurl, region + coords", slurl.getSLURLString(),
+					  "https://my.grid.com/region/my%20region/1/2/3");
+
 		slurl = LLSLURL("https://my.grid.com/region/my region");
 		ensure_equals("grid slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals("grid slurl, region + coords", slurl.getSLURLString(), 
+		ensure_equals("grid slurl, region + coords", slurl.getSLURLString(),
 					  "https://my.grid.com/region/my%20region/128/128/0");
-		
-		LLGridManager::getInstance()->setGridChoice("foo.bar.com");		
+
+		LLGridManager::getInstance()->setGridChoice("foo.bar.com");
 		slurl = LLSLURL("/myregion/1/2/3");
 		ensure_equals("/: slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals("/ slurl, region + coords", slurl.getSLURLString(), 
-					  "https://foo.bar.com/region/myregion/1/2/3");		
-		
+		ensure_equals("/ slurl, region + coords", slurl.getSLURLString(),
+					  "https://foo.bar.com/region/myregion/1/2/3");
+
 		slurl = LLSLURL("myregion/1/2/3");
 		ensure_equals(": slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals(" slurl, region + coords", slurl.getSLURLString(), 
-					  "https://foo.bar.com/region/myregion/1/2/3");		
-		
+		ensure_equals(" slurl, region + coords", slurl.getSLURLString(),
+					  "https://foo.bar.com/region/myregion/1/2/3");
+
 		slurl = LLSLURL(LLSLURL::SIM_LOCATION_HOME);
 		ensure_equals("home", slurl.getType(), LLSLURL::HOME_LOCATION);
 
 		slurl = LLSLURL(LLSLURL::SIM_LOCATION_LAST);
 		ensure_equals("last", slurl.getType(), LLSLURL::LAST_LOCATION);
-		
+
 		slurl = LLSLURL("secondlife:///app/foo/bar?12345");
-		ensure_equals("app", slurl.getType(), LLSLURL::APP);		
+		ensure_equals("app", slurl.getType(), LLSLURL::APP);
 		ensure_equals("appcmd", slurl.getAppCmd(), "foo");
 		ensure_equals("apppath", slurl.getAppPath().size(), 1);
 		ensure_equals("apppath2", slurl.getAppPath()[0].asString(), "bar");
 		ensure_equals("appquery", slurl.getAppQuery(), "12345");
-		ensure_equals("grid1", "foo.bar.com", slurl.getGrid());
-	
+		ensure_equals("grid1", slurl.getGrid(), "FooBar");
+
 		slurl = LLSLURL("secondlife://Aditi/app/foo/bar?12345");
-		ensure_equals("app", slurl.getType(), LLSLURL::APP);		
+		ensure_equals("app", slurl.getType(), LLSLURL::APP);
 		ensure_equals("appcmd", slurl.getAppCmd(), "foo");
 		ensure_equals("apppath", slurl.getAppPath().size(), 1);
 		ensure_equals("apppath2", slurl.getAppPath()[0].asString(), "bar");
 		ensure_equals("appquery", slurl.getAppQuery(), "12345");
-		ensure_equals("grid2", "util.aditi.lindenlab.com", slurl.getGrid());		
+		ensure_equals("grid2",  slurl.getGrid(), "Aditi");
 
-		LLGridManager::getInstance()->setGridChoice("foo.bar.com");			
+		LLGridManager::getInstance()->setGridChoice("foo.bar.com");
 		slurl = LLSLURL("secondlife:///secondlife/myregion/1/2/3");
 		ensure_equals("/: slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION);
 		ensure_equals("location", slurl.getType(), LLSLURL::LOCATION);
 		ensure_equals("region" , "myregion", slurl.getRegion());
-		ensure_equals("grid3", "util.agni.lindenlab.com", slurl.getGrid());
-				
+		ensure_equals("grid3", slurl.getGrid(), "util.agni.lindenlab.com");
+
 		slurl = LLSLURL("secondlife://Aditi/secondlife/myregion/1/2/3");
 		ensure_equals("/: slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION);
 		ensure_equals("location", slurl.getType(), LLSLURL::LOCATION);
 		ensure_equals("region" , "myregion", slurl.getRegion());
-		ensure_equals("grid4", "util.aditi.lindenlab.com", slurl.getGrid());		
-		
+		ensure_equals("grid4", slurl.getGrid(), "Aditi" );
+
 		LLGridManager::getInstance()->setGridChoice("my.grid.com");
 		slurl = LLSLURL("https://my.grid.com/app/foo/bar?12345");
-		ensure_equals("app", slurl.getType(), LLSLURL::APP);		
+		ensure_equals("app", slurl.getType(), LLSLURL::APP);
 		ensure_equals("appcmd", slurl.getAppCmd(), "foo");
 		ensure_equals("apppath", slurl.getAppPath().size(), 1);
 		ensure_equals("apppath2", slurl.getAppPath()[0].asString(), "bar");
-		ensure_equals("appquery", slurl.getAppQuery(), "12345");	
-		
+		ensure_equals("appquery", slurl.getAppQuery(), "12345");
+
 	}
-	
+
 	// construction from grid/region/vector combos
 	template<> template<>
 	void slurlTestObject::test<2>()
 	{
-		LLSLURL slurl = LLSLURL("mygrid.com", "my region");
+		llofstream gridfile("grid_test.xml");
+		gridfile << gSampleGridFile;
+		gridfile.close();
+
+		LLGridManager::getInstance()->initialize("grid_test.xml");
+
+		LLSLURL slurl = LLSLURL("my.grid.com", "my region");
 		ensure_equals("grid/region - type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals("grid/region", slurl.getSLURLString(), 
-					  "https://mygrid.com/region/my%20region/128/128/0");	
-		
-		slurl = LLSLURL("mygrid.com", "my region", LLVector3(1,2,3));
+		ensure_equals("grid/region", slurl.getSLURLString(),
+					  "https://my.grid.com/region/my%20region/128/128/0");
+
+		slurl = LLSLURL("my.grid.com", "my region", LLVector3(1,2,3));
 		ensure_equals("grid/region/vector - type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals(" grid/region/vector", slurl.getSLURLString(), 
-					  "https://mygrid.com/region/my%20region/1/2/3");			
+		ensure_equals(" grid/region/vector", slurl.getSLURLString(),
+					  "https://my.grid.com/region/my%20region/1/2/3");
 
-		LLGridManager::getInstance()->setGridChoice("foo.bar.com.bar");			
+		LLGridManager::getInstance()->setGridChoice("util.agni.lindenlab.com");
 		slurl = LLSLURL("my region", LLVector3(1,2,3));
-		ensure_equals("grid/region/vector - type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals(" grid/region/vector", slurl.getSLURLString(), 
-					  "https://foo.bar.com.bar/region/my%20region/1/2/3");	
-		
-		LLGridManager::getInstance()->setGridChoice("util.agni.lindenlab.com");	
+		ensure_equals("default grid/region/vector - type", slurl.getType(), LLSLURL::LOCATION);
+		ensure_equals(" default grid/region/vector", slurl.getSLURLString(),
+					  "http://maps.secondlife.com/secondlife/my%20region/1/2/3");
+
+		LLGridManager::getInstance()->setGridChoice("MyGrid");
 		slurl = LLSLURL("my region", LLVector3(1,2,3));
 		ensure_equals("default grid/region/vector - type", slurl.getType(), LLSLURL::LOCATION);
-		ensure_equals(" default grid/region/vector", slurl.getSLURLString(), 
-					  "http://maps.secondlife.com/secondlife/my%20region/1/2/3");	
-		
+		ensure_equals(" default grid/region/vector", slurl.getSLURLString(),
+					  "https://my.grid.com/region/my%20region/1/2/3");
+
 	}
 	// Accessors
 	template<> template<>
 	void slurlTestObject::test<3>()
 	{
-		LLGridManager::getInstance()->setGridChoice("my.grid.com");		
+		llofstream gridfile("grid_test.xml");
+		gridfile << gSampleGridFile;
+		gridfile.close();
+
+		LLGridManager::getInstance()->initialize("grid_test.xml");
+
+		LLGridManager::getInstance()->setGridChoice("my.grid.com");
 		LLSLURL slurl = LLSLURL("https://my.grid.com/region/my%20region/1/2/3");
 		ensure_equals("login string", slurl.getLoginString(), "uri:my region&amp;1&amp;2&amp;3");
 		ensure_equals("location string", slurl.getLocationString(), "my region/1/2/3");
 		ensure_equals("grid", slurl.getGrid(), "my.grid.com");
 		ensure_equals("region", slurl.getRegion(), "my region");
 		ensure_equals("position", slurl.getPosition(), LLVector3(1, 2, 3));
-		
+
 	}
 }
diff --git a/indra/newview/tests/llviewerassetstats_test.cpp b/indra/newview/tests/llviewerassetstats_test.cpp
index f8923b9868..f8923b9868 100644..100755
--- a/indra/newview/tests/llviewerassetstats_test.cpp
+++ b/indra/newview/tests/llviewerassetstats_test.cpp
diff --git a/indra/newview/tests/llviewernetwork_test.cpp b/indra/newview/tests/llviewernetwork_test.cpp
index 3c89b64d52..a1e97ea17e 100644
--- a/indra/newview/tests/llviewernetwork_test.cpp
+++ b/indra/newview/tests/llviewernetwork_test.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llviewernetwork_test.cpp
  * @author Roxie
  * @date 2009-03-9
@@ -7,21 +7,21 @@
  * $LicenseInfo:firstyear=2009&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -31,8 +31,8 @@
 #include "../../llxml/llcontrol.h"
 #include "llfile.h"
 
-//----------------------------------------------------------------------------               
-// Mock objects for the dependencies of the code we're testing                               
+//----------------------------------------------------------------------------
+// Mock objects for the dependencies of the code we're testing
 
 LLControlGroup::LLControlGroup(const std::string& name)
 : LLInstanceTracker<LLControlGroup, std::string>(name) {}
@@ -81,26 +81,57 @@ LLPointer<LLControlVariable> LLControlGroup::getControl(const std::string& name)
 
 LLControlGroup gSavedSettings("test");
 
-const char *gSampleGridFile = "<llsd><map>"
-"<key>grid1</key><map>"
-"  <key>favorite</key><integer>1</integer>"
-"  <key>helper_uri</key><string>https://helper1/helpers/</string>"
-"  <key>label</key><string>mylabel</string>"
-"  <key>login_page</key><string>loginpage</string>"
-"  <key>login_uri</key><array><string>myloginuri</string></array>"
-"  <key>name</key><string>grid1</string>"
-"  <key>visible</key><integer>1</integer>"
-"  <key>credential_type</key><string>agent</string>"
-"  <key>grid_login_id</key><string>MyGrid</string>"
-"</map>"
-"<key>util.agni.lindenlab.com</key><map>"
-"  <key>favorite</key><integer>1</integer>"
-"  <key>helper_uri</key><string>https://helper1/helpers/</string>"
-"  <key>label</key><string>mylabel</string>"
-"  <key>login_page</key><string>loginpage</string>"
-"  <key>login_uri</key><array><string>myloginuri</string></array>"
-"  <key>name</key><string>util.agni.lindenlab.com</string>"
-"</map></map></llsd>";
+const char *gSampleGridFile =
+	"<?xml version=\"1.0\"?>"
+	"<llsd>"
+	"  <map>"
+	"    <key>altgrid.long.name</key>"
+	"    <map>"
+	"      <key>helper_uri</key><string>https://helper1/helpers/</string>"
+	"      <key>label</key><string>Alternative Grid</string>"
+	"      <key>login_page</key><string>altgrid/loginpage</string>"
+	"      <key>login_uri</key>"
+	"      <array>"
+	"        <string>altgrid/myloginuri1</string>"
+	"        <string>altgrid/myloginuri2</string>"
+	"      </array>"
+	"      <key>keyname</key><string>altgrid.long.name</string>"
+	"      <key>credential_type</key><string>agent</string>"
+	"      <key>grid_login_id</key><string>AltGrid</string>"
+	"    </map>"
+	"    <key>minimal.long.name</key>"
+	"    <map>"
+	"      <key>keyname</key><string>minimal.long.name</string>"
+	"    </map>"
+	"    <!-- Note that the values for agni and aditi below are deliberately"
+	"         incorrect to test that they are not overwritten -->"
+	"    <key>util.agni.lindenlab.com</key> <!-- conflict -->"
+	"    <map>"
+	"      <key>helper_uri</key><string>https://helper1/helpers/</string>"
+	"      <key>grid_login_id</key><string>mylabel</string>"
+	"      <key>label</key><string>mylabel</string>"
+	"      <key>login_page</key><string>loginpage</string>"
+	"      <key>login_uri</key>"
+	"      <array>"
+	"        <string>myloginuri</string>"
+	"      </array>"
+	"      <key>keyname</key><string>util.agni.lindenlab.com</string> <!-- conflict -->"
+	"    </map>"
+	"    <key>util.foobar.lindenlab.com</key>"
+	"    <map>"
+	"      <key>helper_uri</key><string>https://helper1/helpers/</string>"
+	"      <key>grid_login_id</key><string>Aditi</string> <!-- conflict -->"
+	"      <key>label</key><string>mylabel</string>"
+	"      <key>login_page</key><string>loginpage</string>"
+	"      <key>login_uri</key>"
+	"      <array>"
+	"        <string>myloginuri</string>"
+	"      </array>"
+	"      <key>keyname</key><string>util.foobar.lindenlab.com</string>"
+	"    </map>"
+	"  </map>"
+	"</llsd>"
+	;
 // -------------------------------------------------------------------------------------------
 // TUT
 // -------------------------------------------------------------------------------------------
@@ -116,63 +147,89 @@ namespace tut
 			gCmdLineGridChoice.clear();
 			gCmdLineHelperURI.clear();
 			gLoginPage.clear();
-			gCurrentGrid.clear();			
+			gCurrentGrid.clear();
 		}
 		~viewerNetworkTest()
 		{
 			LLFile::remove("grid_test.xml");
 		}
 	};
-	
+
 	// Tut templating thingamagic: test group, object and test instance
 	typedef test_group<viewerNetworkTest> viewerNetworkTestFactory;
 	typedef viewerNetworkTestFactory::object viewerNetworkTestObject;
 	tut::viewerNetworkTestFactory tut_test("LLViewerNetwork");
-	
+
 	// ---------------------------------------------------------------------------------------
-	// Test functions 
+	// Test functions
 	// ---------------------------------------------------------------------------------------
 	// initialization without a grid file
 	template<> template<>
 	void viewerNetworkTestObject::test<1>()
 	{
-
 		LLGridManager *manager = LLGridManager::getInstance();
 		// grid file doesn't exist
 		manager->initialize("grid_test.xml");
 		// validate that some of the defaults are available.
 		std::map<std::string, std::string> known_grids = manager->getKnownGrids();
-		ensure_equals("Known grids is a string-string map of size 23", known_grids.size(), 23);
-		ensure_equals("Agni has the right name and label", 
-					  known_grids[std::string("util.agni.lindenlab.com")], std::string("Agni"));
-		ensure_equals("None exists", known_grids[""], "None");
-		
-		LLSD grid;
-		LLGridManager::getInstance()->getGridInfo("util.agni.lindenlab.com", grid);
-		ensure("Grid info for agni is a map", grid.isMap());
-		ensure_equals("name is correct for agni", 
-					  grid[GRID_VALUE].asString(), std::string("util.agni.lindenlab.com"));
-		ensure_equals("label is correct for agni", 
-					  grid[GRID_LABEL_VALUE].asString(), std::string("Agni"));
-		ensure("Login URI is an array", 
-			   grid[GRID_LOGIN_URI_VALUE].isArray());
-		ensure_equals("Agni login uri is correct", 
-					  grid[GRID_LOGIN_URI_VALUE][0].asString(), 
+		ensure_equals("Known grids is a string-string map of size 2", known_grids.size(), 2);
+		ensure_equals("Agni has the right name and label",
+					  known_grids[std::string("util.agni.lindenlab.com")],
+					  std::string("Second Life Main Grid (Agni)"));
+		ensure_equals("Aditi has the right name and label",
+					  known_grids[std::string("util.aditi.lindenlab.com")],
+					  std::string("Second Life Beta Test Grid (Aditi)"));
+		ensure_equals("name for agni",
+					  LLGridManager::getInstance()->getGrid("util.agni.lindenlab.com"),
+					  std::string("util.agni.lindenlab.com"));
+		ensure_equals("id for agni",
+					  std::string("Agni"),
+					  LLGridManager::getInstance()->getGridId("util.agni.lindenlab.com"));
+		ensure_equals("label for agni",
+					  LLGridManager::getInstance()->getGridLabel("util.agni.lindenlab.com"),
+					  std::string("Second Life Main Grid (Agni)"));
+
+		std::vector<std::string> login_uris;
+		LLGridManager::getInstance()->getLoginURIs(std::string("util.agni.lindenlab.com"), login_uris);
+		ensure_equals("Number of login uris for agni", 1, login_uris.size());
+		ensure_equals("Agni login uri",
+					  login_uris[0],
 					  std::string("https://login.agni.lindenlab.com/cgi-bin/login.cgi"));
-		ensure_equals("Agni helper uri is correct",
-					  grid[GRID_HELPER_URI_VALUE].asString(), 
+		ensure_equals("Agni helper uri",
+					  LLGridManager::getInstance()->getHelperURI("util.agni.lindenlab.com"),
 					  std::string("https://secondlife.com/helpers/"));
-		ensure_equals("Agni login page is correct",
-					  grid[GRID_LOGIN_PAGE_VALUE].asString(), 
+		ensure_equals("Agni login page",
+					  LLGridManager::getInstance()->getLoginPage("util.agni.lindenlab.com"),
 					  std::string("http://viewer-login.agni.lindenlab.com/"));
-		ensure("Agni is a favorite",
-			   grid.has(GRID_IS_FAVORITE_VALUE));
-		ensure("Agni is a system grid", 
-			   grid.has(GRID_IS_SYSTEM_GRID_VALUE));
-		ensure("Grid file wasn't greated as it wasn't saved", 
-			   !LLFile::isfile("grid_test.xml"));
+		ensure("Agni is a system grid",
+			   LLGridManager::getInstance()->isSystemGrid("util.agni.lindenlab.com"));
+
+		ensure_equals("name for aditi",
+					  LLGridManager::getInstance()->getGrid("util.aditi.lindenlab.com"),
+					  std::string("util.aditi.lindenlab.com"));
+		ensure_equals("id for aditi",
+					  LLGridManager::getInstance()->getGridId("util.aditi.lindenlab.com"),
+					  std::string("Aditi"));
+		ensure_equals("label for aditi",
+					  LLGridManager::getInstance()->getGridLabel("util.aditi.lindenlab.com"),
+					  std::string("Second Life Beta Test Grid (Aditi)"));
+
+		LLGridManager::getInstance()->getLoginURIs(std::string("util.aditi.lindenlab.com"), login_uris);
+
+		ensure_equals("Number of login uris for aditi", 1, login_uris.size());
+		ensure_equals("Aditi login uri",
+					  login_uris[0],
+					  std::string("https://login.aditi.lindenlab.com/cgi-bin/login.cgi"));
+		ensure_equals("Aditi helper uri",
+					  LLGridManager::getInstance()->getHelperURI("util.aditi.lindenlab.com"),
+					  std::string("http://aditi-secondlife.webdev.lindenlab.com/helpers/"));
+		ensure_equals("Aditi login page",
+					  LLGridManager::getInstance()->getLoginPage("util.aditi.lindenlab.com"),
+					  std::string("http://viewer-login.agni.lindenlab.com/"));
+		ensure("Aditi is a system grid",
+			   LLGridManager::getInstance()->isSystemGrid("util.aditi.lindenlab.com"));
 	}
-	
+
 	// initialization with a grid file
 	template<> template<>
 	void viewerNetworkTestObject::test<2>()
@@ -180,402 +237,172 @@ namespace tut
 		llofstream gridfile("grid_test.xml");
 		gridfile << gSampleGridFile;
 		gridfile.close();
-		
+
 		LLGridManager::getInstance()->initialize("grid_test.xml");
 		std::map<std::string, std::string> known_grids = LLGridManager::getInstance()->getKnownGrids();
-		ensure_equals("adding a grid via a grid file increases known grid size", 
-					  known_grids.size(), 24);
-		ensure_equals("Agni is still there after we've added a grid via a grid file", 
-					  known_grids["util.agni.lindenlab.com"], std::string("Agni"));
-	
-		
-		// assure Agni doesn't get overwritten
-		LLSD grid;
-		LLGridManager::getInstance()->getGridInfo("util.agni.lindenlab.com", grid);
+		ensure_equals("adding a grid via a grid file increases known grid size",4, 
+					  known_grids.size());
 
-		ensure_equals("Agni grid label was not modified by grid file", 
-					  grid[GRID_LABEL_VALUE].asString(), std::string("Agni"));
-		
-		ensure_equals("Agni name wasn't modified by grid file",
-					  grid[GRID_VALUE].asString(), std::string("util.agni.lindenlab.com"));
-		ensure("Agni grid URI is still an array after grid file", 
-			   grid[GRID_LOGIN_URI_VALUE].isArray());
-		ensure_equals("Agni login uri still the same after grid file", 
-					  grid[GRID_LOGIN_URI_VALUE][0].asString(),  
+		// Verify that Agni and Aditi were not overwritten
+		ensure_equals("Agni has the right name and label",
+					  known_grids[std::string("util.agni.lindenlab.com")], 
+					  std::string("Second Life Main Grid (Agni)"));
+		ensure_equals("Aditi has the right name and label",
+					  known_grids[std::string("util.aditi.lindenlab.com")], 
+					  std::string("Second Life Beta Test Grid (Aditi)"));
+		ensure_equals("name for agni",
+					  LLGridManager::getInstance()->getGrid("util.agni.lindenlab.com"),
+					  std::string("util.agni.lindenlab.com"));
+		ensure_equals("id for agni",
+					  LLGridManager::getInstance()->getGridId("util.agni.lindenlab.com"),
+					  std::string("Agni"));
+		ensure_equals("label for agni",
+					  LLGridManager::getInstance()->getGridLabel("util.agni.lindenlab.com"),
+					  std::string("Second Life Main Grid (Agni)"));
+		std::vector<std::string> login_uris;
+		LLGridManager::getInstance()->getLoginURIs(std::string("util.agni.lindenlab.com"), login_uris);
+		ensure_equals("Number of login uris for agni", 1, login_uris.size());
+		ensure_equals("Agni login uri",
+					  login_uris[0],
 					  std::string("https://login.agni.lindenlab.com/cgi-bin/login.cgi"));
-		ensure_equals("Agni helper uri still the same after grid file", 
-					  grid[GRID_HELPER_URI_VALUE].asString(), 
+		ensure_equals("Agni helper uri",
+					  LLGridManager::getInstance()->getHelperURI("util.agni.lindenlab.com"),
 					  std::string("https://secondlife.com/helpers/"));
-		ensure_equals("Agni login page the same after grid file", 
-					  grid[GRID_LOGIN_PAGE_VALUE].asString(), 
+		ensure_equals("Agni login page",
+					  LLGridManager::getInstance()->getLoginPage("util.agni.lindenlab.com"),
 					  std::string("http://viewer-login.agni.lindenlab.com/"));
-		ensure("Agni still a favorite after grid file", 
-			   grid.has(GRID_IS_FAVORITE_VALUE));
-		ensure("Agni system grid still set after grid file", 
-			   grid.has(GRID_IS_SYSTEM_GRID_VALUE));
-		
-		ensure_equals("Grid file adds to name<->label map", 
-					  known_grids["grid1"], std::string("mylabel"));
-		LLGridManager::getInstance()->getGridInfo("grid1", grid);
-		ensure_equals("grid file grid name is set",
-					  grid[GRID_VALUE].asString(), std::string("grid1"));
-		ensure_equals("grid file label is set", 
-					  grid[GRID_LABEL_VALUE].asString(), std::string("mylabel"));
-		ensure("grid file login uri is an array",
-			   grid[GRID_LOGIN_URI_VALUE].isArray());
-		ensure_equals("grid file login uri is set",
-					  grid[GRID_LOGIN_URI_VALUE][0].asString(), 
-					  std::string("myloginuri"));
-		ensure_equals("grid file helper uri is set",
-					  grid[GRID_HELPER_URI_VALUE].asString(), 
-					  std::string("https://helper1/helpers/"));
-		ensure_equals("grid file login page is set",
-					  grid[GRID_LOGIN_PAGE_VALUE].asString(), 
-					  std::string("loginpage"));
-		ensure("grid file favorite is set",
-			   grid.has(GRID_IS_FAVORITE_VALUE));
-		ensure("grid file isn't a system grid",
-			   !grid.has(GRID_IS_SYSTEM_GRID_VALUE));		
-		ensure("Grid file still exists after loading", 
-			   LLFile::isfile("grid_test.xml"));
-	}
-	
-	// Initialize via command line
-	
-	template<> template<>
-	void viewerNetworkTestObject::test<3>()
-	{	
-		// USE --grid command line
-		// initialize with a known grid
-		LLSD grid;
-		gCmdLineGridChoice = "Aditi";
-		LLGridManager::getInstance()->initialize("grid_test.xml");
-		// with single login uri specified.
-		std::map<std::string, std::string> known_grids = LLGridManager::getInstance()->getKnownGrids();
-		ensure_equals("Using a known grid via command line doesn't increase number of known grids", 
-					  known_grids.size(), 23);
-		ensure_equals("getGridLabel", LLGridManager::getInstance()->getGridLabel(), std::string("Aditi"));
-		// initialize with a known grid in lowercase
-		gCmdLineGridChoice = "agni";
-		LLGridManager::getInstance()->initialize("grid_test.xml");
-		ensure_equals("getGridLabel", LLGridManager::getInstance()->getGridLabel(), std::string("Agni"));		
-		
-		// now try a command line with a custom grid identifier
-		gCmdLineGridChoice = "mycustomgridchoice";		
-		LLGridManager::getInstance()->initialize("grid_test.xml");
-		known_grids = LLGridManager::getInstance()->getKnownGrids();
-		ensure_equals("adding a command line grid with custom name increases known grid size", 
-					  known_grids.size(), 24);
-		ensure_equals("Custom Command line grid is added to the list of grids", 
-					  known_grids["mycustomgridchoice"], std::string("mycustomgridchoice"));
-		LLGridManager::getInstance()->getGridInfo("mycustomgridchoice", grid);
-		ensure_equals("Custom Command line grid name is set",
-					  grid[GRID_VALUE].asString(), std::string("mycustomgridchoice"));
-		ensure_equals("Custom Command line grid label is set", 
-					  grid[GRID_LABEL_VALUE].asString(), std::string("mycustomgridchoice"));		
-		ensure("Custom Command line grid login uri is an array",
-			   grid[GRID_LOGIN_URI_VALUE].isArray());
-		ensure_equals("Custom Command line grid login uri is set",
-					  grid[GRID_LOGIN_URI_VALUE][0].asString(), 
-					  std::string("https://mycustomgridchoice/cgi-bin/login.cgi"));
-		ensure_equals("Custom Command line grid helper uri is set",
-					  grid[GRID_HELPER_URI_VALUE].asString(), 
-					  std::string("https://mycustomgridchoice/helpers/"));
-		ensure_equals("Custom Command line grid login page is set",
-					  grid[GRID_LOGIN_PAGE_VALUE].asString(), 
-					  std::string("http://mycustomgridchoice/app/login/"));
-	}
-	
-	// validate override of login uri with cmd line
-	template<> template<>
-	void viewerNetworkTestObject::test<4>()
-	{			
-		// Override with loginuri
-		// override known grid
-		LLSD grid;
-		gCmdLineGridChoice = "Aditi";
-		gCmdLineLoginURI = "https://my.login.uri/cgi-bin/login.cgi";		
-		LLGridManager::getInstance()->initialize("grid_test.xml");		
-		std::map<std::string, std::string> known_grids = LLGridManager::getInstance()->getKnownGrids();		
-		ensure_equals("Override known grid login uri: No grids are added", 
-					  known_grids.size(), 23);
-		LLGridManager::getInstance()->getGridInfo(grid);
-		ensure("Override known grid login uri: login uri is an array",
-			   grid[GRID_LOGIN_URI_VALUE].isArray());
-		ensure_equals("Override known grid login uri: Command line grid login uri is set",
-					  grid[GRID_LOGIN_URI_VALUE][0].asString(), 
-					  std::string("https://my.login.uri/cgi-bin/login.cgi"));
-		ensure_equals("Override known grid login uri: helper uri is not changed",
-					  grid[GRID_HELPER_URI_VALUE].asString(), 
-					  std::string("http://aditi-secondlife.webdev.lindenlab.com/helpers/"));
-		ensure_equals("Override known grid login uri: login page is not set",
-					  grid[GRID_LOGIN_PAGE_VALUE].asString(), 
-					  std::string("http://viewer-login.agni.lindenlab.com/"));		
-		
-		// Override with loginuri
-		// override custom grid
-		gCmdLineGridChoice = "mycustomgridchoice";
-		gCmdLineLoginURI = "https://my.login.uri/cgi-bin/login.cgi";		
-		LLGridManager::getInstance()->initialize("grid_test.xml");		
-		known_grids = LLGridManager::getInstance()->getKnownGrids();
-		LLGridManager::getInstance()->getGridInfo(grid);
-		ensure_equals("Override custom grid login uri: Grid is added", 
-					  known_grids.size(), 24);		
-		ensure("Override custom grid login uri: login uri is an array",
-			   grid[GRID_LOGIN_URI_VALUE].isArray());
-		ensure_equals("Override custom grid login uri: login uri is set",
-					  grid[GRID_LOGIN_URI_VALUE][0].asString(), 
-					  std::string("https://my.login.uri/cgi-bin/login.cgi"));
-		ensure_equals("Override custom grid login uri: Helper uri is not set",
-					  grid[GRID_HELPER_URI_VALUE].asString(), 
-					  std::string("https://mycustomgridchoice/helpers/"));
-		ensure_equals("Override custom grid login uri: Login page is not set",
-					  grid[GRID_LOGIN_PAGE_VALUE].asString(), 
-					  std::string("http://mycustomgridchoice/app/login/"));
-	}
-	
-	// validate override of helper uri with cmd line
-	template<> template<>
-	void viewerNetworkTestObject::test<5>()
-	{	
-		// Override with helperuri
-		// override known grid
-		LLSD grid;
-		gCmdLineGridChoice = "Aditi";
-		gCmdLineLoginURI = "";
-		gCmdLineHelperURI = "https://my.helper.uri/mycustomhelpers";		
-		LLGridManager::getInstance()->initialize("grid_test.xml");		
-		std::map<std::string, std::string> known_grids = LLGridManager::getInstance()->getKnownGrids();		
-		ensure_equals("Override known grid helper uri: No grids are added", 
-					  known_grids.size(), 23);
-		LLGridManager::getInstance()->getGridInfo(grid);
-		ensure("Override known known helper uri: login uri is an array",
-			   grid[GRID_LOGIN_URI_VALUE].isArray());
-		ensure_equals("Override known grid helper uri: login uri is not changed",
-					  grid[GRID_LOGIN_URI_VALUE][0].asString(), 
-					  std::string("https://login.aditi.lindenlab.com/cgi-bin/login.cgi"));
-		ensure_equals("Override known grid helper uri: helper uri is changed",
-					  grid[GRID_HELPER_URI_VALUE].asString(), 
-					  std::string("https://my.helper.uri/mycustomhelpers"));
-		ensure_equals("Override known grid helper uri: login page is not changed",
-					  grid[GRID_LOGIN_PAGE_VALUE].asString(), 
-					  std::string("http://viewer-login.agni.lindenlab.com/"));		
-		
-		// Override with helperuri
-		// override custom grid
-		gCmdLineGridChoice = "mycustomgridchoice";
-		gCmdLineHelperURI = "https://my.helper.uri/mycustomhelpers";		
-		LLGridManager::getInstance()->initialize("grid_test.xml");	
-		known_grids = LLGridManager::getInstance()->getKnownGrids();
-		ensure_equals("Override custom grid helper uri: grids is added", 
-					  known_grids.size(), 24);
-		LLGridManager::getInstance()->getGridInfo(grid);
-		ensure("Override custom helper uri: login uri is an array",
-			   grid[GRID_LOGIN_URI_VALUE].isArray());
-		ensure_equals("Override custom grid helper uri: login uri is not changed",
-					  grid[GRID_LOGIN_URI_VALUE][0].asString(), 
-					  std::string("https://mycustomgridchoice/cgi-bin/login.cgi"));
-		ensure_equals("Override custom grid helper uri: helper uri is changed",
-					  grid[GRID_HELPER_URI_VALUE].asString(), 
-					  std::string("https://my.helper.uri/mycustomhelpers"));
-		ensure_equals("Override custom grid helper uri: login page is not changed",
-					  grid[GRID_LOGIN_PAGE_VALUE].asString(), 
-					  std::string("http://mycustomgridchoice/app/login/"));
-	}
-	
-	// validate overriding of login page via cmd line
-	template<> template<>
-	void viewerNetworkTestObject::test<6>()
-	{	
-		// Override with login page
-		// override known grid
-		LLSD grid;
-		gCmdLineGridChoice = "Aditi";
-		gCmdLineHelperURI = "";
-		gLoginPage = "myloginpage";		
-		LLGridManager::getInstance()->initialize("grid_test.xml");		
-		std::map<std::string, std::string> known_grids = LLGridManager::getInstance()->getKnownGrids();				
-		ensure_equals("Override known grid login page: No grids are added", 
-					  known_grids.size(), 23);
-		LLGridManager::getInstance()->getGridInfo(grid);
-		ensure("Override known grid login page: Command line grid login uri is an array",
-			   grid[GRID_LOGIN_URI_VALUE].isArray());
-		ensure_equals("Override known grid login page: login uri is not changed",
-					  grid[GRID_LOGIN_URI_VALUE][0].asString(), 
+		ensure("Agni is a system grid",
+			   LLGridManager::getInstance()->isSystemGrid("util.agni.lindenlab.com"));
+
+		ensure_equals("name for aditi",
+					  LLGridManager::getInstance()->getGrid("util.aditi.lindenlab.com"),
+					  std::string("util.aditi.lindenlab.com"));
+		ensure_equals("id for aditi",
+					  LLGridManager::getInstance()->getGridId("util.aditi.lindenlab.com"),
+					  std::string("Aditi"));
+		ensure_equals("label for aditi",
+					  LLGridManager::getInstance()->getGridLabel("util.aditi.lindenlab.com"),
+					  std::string("Second Life Beta Test Grid (Aditi)"));
+
+		LLGridManager::getInstance()->getLoginURIs(std::string("util.aditi.lindenlab.com"), login_uris);
+		ensure_equals("Number of login uris for aditi", 1, login_uris.size());
+		ensure_equals("Aditi login uri",
+					  login_uris[0],
 					  std::string("https://login.aditi.lindenlab.com/cgi-bin/login.cgi"));
-		ensure_equals("Override known grid login page: helper uri is not changed",
-					  grid[GRID_HELPER_URI_VALUE].asString(), 
+		ensure_equals("Aditi helper uri",
+					  LLGridManager::getInstance()->getHelperURI("util.aditi.lindenlab.com"),
 					  std::string("http://aditi-secondlife.webdev.lindenlab.com/helpers/"));
-		ensure_equals("Override known grid login page: login page is changed",
-					  grid[GRID_LOGIN_PAGE_VALUE].asString(), 
-					  std::string("myloginpage"));		
-		
-		// Override with login page
-		// override custom grid
-		gCmdLineGridChoice = "mycustomgridchoice";
-		gLoginPage = "myloginpage";
-		LLGridManager::getInstance()->initialize("grid_test.xml");		
-		known_grids = LLGridManager::getInstance()->getKnownGrids();
-		ensure_equals("Override custom grid login page: grids are added", 
-					  known_grids.size(), 24);
-		LLGridManager::getInstance()->getGridInfo(grid);
-		ensure("Override custom grid login page: Command line grid login uri is an array",
-			   grid[GRID_LOGIN_URI_VALUE].isArray());
-		ensure_equals("Override custom grid login page: login uri is not changed",
-					  grid[GRID_LOGIN_URI_VALUE][0].asString(), 
-					  std::string("https://mycustomgridchoice/cgi-bin/login.cgi"));
-		ensure_equals("Override custom grid login page: helper uri is not changed",
-					  grid[GRID_HELPER_URI_VALUE].asString(), 
-					  std::string("https://mycustomgridchoice/helpers/"));
-		ensure_equals("Override custom grid login page: login page is changed",
-					  grid[GRID_LOGIN_PAGE_VALUE].asString(), 
-					  std::string("myloginpage"));	
-		
+		ensure_equals("Aditi login page",
+					  LLGridManager::getInstance()->getLoginPage("util.aditi.lindenlab.com"),
+					  std::string("http://viewer-login.agni.lindenlab.com/"));
+		ensure("Aditi is a system grid",
+			   LLGridManager::getInstance()->isSystemGrid("util.aditi.lindenlab.com"));
+
+		// Check the additional grid from the file
+		ensure_equals("alternative grid is in name<->label map",
+					  known_grids["altgrid.long.name"], 
+					  std::string("Alternative Grid"));
+		ensure_equals("alternative grid name is set",
+					  LLGridManager::getInstance()->getGrid("altgrid.long.name"),
+					  std::string("altgrid.long.name"));
+		ensure_equals("alternative grid id",
+					  LLGridManager::getInstance()->getGridId("altgrid.long.name"),
+					  std::string("AltGrid"));
+		ensure_equals("alternative grid label",
+					  LLGridManager::getInstance()->getGridLabel("altgrid.long.name"),
+					  std::string("Alternative Grid"));
+		std::vector<std::string> alt_login_uris;
+		LLGridManager::getInstance()->getLoginURIs(std::string("altgrid.long.name"), alt_login_uris);
+		ensure_equals("Number of login uris for altgrid", 2, alt_login_uris.size());
+		ensure_equals("alternative grid first login uri",
+					  alt_login_uris[0],
+					  std::string("altgrid/myloginuri1"));
+		ensure_equals("alternative grid second login uri",
+					  alt_login_uris[1],
+					  std::string("altgrid/myloginuri2"));
+		ensure_equals("alternative grid helper uri",
+					  LLGridManager::getInstance()->getHelperURI("altgrid.long.name"),
+					  std::string("https://helper1/helpers/"));
+		ensure_equals("alternative grid login page",
+					  LLGridManager::getInstance()->getLoginPage("altgrid.long.name"),
+					  std::string("altgrid/loginpage"));
+		ensure("alternative grid is NOT a system grid",
+			   ! LLGridManager::getInstance()->isSystemGrid("altgrid.long.name"));
+
+		ensure_equals("minimal grid is in name<->label map",
+					  known_grids["minimal.long.name"], 
+					  std::string("minimal.long.name"));
+		ensure_equals("minimal grid name is set",
+					  LLGridManager::getInstance()->getGrid("minimal.long.name"),
+					  std::string("minimal.long.name"));
+		ensure_equals("minimal grid id",
+					  LLGridManager::getInstance()->getGridId("minimal.long.name"),
+					  std::string("minimal.long.name"));
+		ensure_equals("minimal grid label",
+					  LLGridManager::getInstance()->getGridLabel("minimal.long.name"),
+					  std::string("minimal.long.name"));
+
+		LLGridManager::getInstance()->getLoginURIs(std::string("minimal.long.name"), alt_login_uris);
+		ensure_equals("Number of login uris for altgrid", 1, alt_login_uris.size());
+		ensure_equals("minimal grid login uri",
+					  alt_login_uris[0],
+					  std::string("https://minimal.long.name/cgi-bin/login.cgi"));
+		ensure_equals("minimal grid helper uri",
+					  LLGridManager::getInstance()->getHelperURI("minimal.long.name"),
+					  std::string("https://minimal.long.name/helpers/"));
+		ensure_equals("minimal grid login page",
+					  LLGridManager::getInstance()->getLoginPage("minimal.long.name"),
+					  std::string("http://minimal.long.name/app/login/"));
+
 	}
-	
+
+
 	// validate grid selection
 	template<> template<>
 	void viewerNetworkTestObject::test<7>()
-	{	
-		LLSD loginURI = LLSD::emptyArray();
-		LLSD grid = LLSD::emptyMap();
+	{
 		// adding a grid with simply a name will populate the values.
-		grid[GRID_VALUE] = "myaddedgrid";
+		llofstream gridfile("grid_test.xml");
+		gridfile << gSampleGridFile;
+		gridfile.close();
 
 		LLGridManager::getInstance()->initialize("grid_test.xml");
-		LLGridManager::getInstance()->addGrid(grid);
-		LLGridManager::getInstance()->setGridChoice("util.agni.lindenlab.com");	
-		ensure_equals("getGridLabel", LLGridManager::getInstance()->getGridLabel(), std::string("Agni"));
-		ensure_equals("getGrid", LLGridManager::getInstance()->getGrid(), 
+
+		LLGridManager::getInstance()->setGridChoice("util.agni.lindenlab.com");
+		ensure_equals("getGridLabel",
+					  LLGridManager::getInstance()->getGridLabel(),
+					  std::string("Second Life Main Grid (Agni)"));
+		ensure_equals("getGridId",
+					  LLGridManager::getInstance()->getGridId(),
+					  std::string("Agni"));
+		ensure_equals("getGrid",
+					  LLGridManager::getInstance()->getGrid(),
 					  std::string("util.agni.lindenlab.com"));
-		ensure_equals("getHelperURI", LLGridManager::getInstance()->getHelperURI(), 
+		ensure_equals("getHelperURI",
+					  LLGridManager::getInstance()->getHelperURI(),
 					  std::string("https://secondlife.com/helpers/"));
-		ensure_equals("getLoginPage", LLGridManager::getInstance()->getLoginPage(), 
+		ensure_equals("getLoginPage",
+					  LLGridManager::getInstance()->getLoginPage(),
 					  std::string("http://viewer-login.agni.lindenlab.com/"));
-		ensure_equals("getLoginPage2", LLGridManager::getInstance()->getLoginPage("util.agni.lindenlab.com"), 
-					  std::string("http://viewer-login.agni.lindenlab.com/"));
-		ensure("Is Agni a production grid", LLGridManager::getInstance()->isInProductionGrid());		
+		ensure("Is Agni a production grid", LLGridManager::getInstance()->isInProductionGrid());
 		std::vector<std::string> uris;
 		LLGridManager::getInstance()->getLoginURIs(uris);
-		ensure_equals("getLoginURIs size", uris.size(), 1);
-		ensure_equals("getLoginURIs", uris[0], 
+		ensure_equals("getLoginURIs size", 1, uris.size());
+		ensure_equals("getLoginURIs",
+					  uris[0],
 					  std::string("https://login.agni.lindenlab.com/cgi-bin/login.cgi"));
-		LLGridManager::getInstance()->setGridChoice("myaddedgrid");
-		ensure_equals("getGridLabel", LLGridManager::getInstance()->getGridLabel(), std::string("myaddedgrid"));		
-		ensure("Is myaddedgrid a production grid", !LLGridManager::getInstance()->isInProductionGrid());
-		
-		LLGridManager::getInstance()->setFavorite();
-		LLGridManager::getInstance()->getGridInfo("myaddedgrid", grid);
-		ensure("setting favorite", grid.has(GRID_IS_FAVORITE_VALUE));
-	}
-	
-	// name based grid population
-	template<> template<>
-	void viewerNetworkTestObject::test<8>()
-	{
-		LLGridManager::getInstance()->initialize("grid_test.xml");
-		LLSD grid = LLSD::emptyMap();
-		// adding a grid with simply a name will populate the values.
-		grid[GRID_VALUE] = "myaddedgrid";
-		LLGridManager::getInstance()->addGrid(grid);
-		LLGridManager::getInstance()->getGridInfo("myaddedgrid", grid);
-		
-		ensure_equals("name based grid has name value", 
-					  grid[GRID_VALUE].asString(),
-					  std::string("myaddedgrid"));
-		ensure_equals("name based grid has label value", 
-					  grid[GRID_LABEL_VALUE].asString(),
-					  std::string("myaddedgrid"));
-		ensure_equals("name based grid has name value", 
-					  grid[GRID_HELPER_URI_VALUE].asString(),
-					  std::string("https://myaddedgrid/helpers/"));
-		ensure_equals("name based grid has name value", 
-					  grid[GRID_LOGIN_PAGE_VALUE].asString(),
-					  std::string("http://myaddedgrid/app/login/"));
-		ensure("name based grid has array loginuri", 
-			   grid[GRID_LOGIN_URI_VALUE].isArray());
-		ensure_equals("name based grid has single login uri value",
-			   grid[GRID_LOGIN_URI_VALUE].size(), 1);
-		ensure_equals("Name based grid login uri is correct",
-					  grid[GRID_LOGIN_URI_VALUE][0].asString(),
-					  std::string("https://myaddedgrid/cgi-bin/login.cgi"));
-		ensure("name based grid is not a favorite yet", 
-			   !grid.has(GRID_IS_FAVORITE_VALUE));
-		ensure("name based grid does not have system setting",
-			   !grid.has(GRID_IS_SYSTEM_GRID_VALUE));
-		
-		llofstream gridfile("grid_test.xml");
-		gridfile << gSampleGridFile;
-		gridfile.close();
-	}
-	
-	// persistence of the grid list with an empty gridfile.
-	template<> template<>
-	void viewerNetworkTestObject::test<9>()
-	{
-		// try with initial grid list without a grid file,
-		// without setting the grid to a saveable favorite.
-		LLGridManager::getInstance()->initialize("grid_test.xml");
-		LLSD grid = LLSD::emptyMap();
-		grid[GRID_VALUE] = std::string("mynewgridname");
-		LLGridManager::getInstance()->addGrid(grid);
-		LLGridManager::getInstance()->saveFavorites();
-		ensure("Grid file exists after saving", 
-			   LLFile::isfile("grid_test.xml"));
-		LLGridManager::getInstance()->initialize("grid_test.xml");
-		// should not be there
-		std::map<std::string, std::string> known_grids = LLGridManager::getInstance()->getKnownGrids();
-		ensure("New grid wasn't added to persisted list without being marked a favorite",
-					  known_grids.find(std::string("mynewgridname")) == known_grids.end());
-		
-		// mark a grid a favorite to make sure it's persisted
-		LLGridManager::getInstance()->addGrid(grid);
-		LLGridManager::getInstance()->setGridChoice("mynewgridname");
-		LLGridManager::getInstance()->setFavorite();
-		LLGridManager::getInstance()->saveFavorites();
-		ensure("Grid file exists after saving", 
-			   LLFile::isfile("grid_test.xml"));
-		LLGridManager::getInstance()->initialize("grid_test.xml");
-		// should not be there
-		known_grids = LLGridManager::getInstance()->getKnownGrids();
-		ensure("New grid wasn't added to persisted list after being marked a favorite",
-					  known_grids.find(std::string("mynewgridname")) !=
-					  known_grids.end());
-	}
-	
-	// persistence of the grid file with existing gridfile
-	template<> template<>
-	void viewerNetworkTestObject::test<10>()
-	{
-		
-		llofstream gridfile("grid_test.xml");
-		gridfile << gSampleGridFile;
-		gridfile.close();
-		
-		LLGridManager::getInstance()->initialize("grid_test.xml");
-		LLSD grid = LLSD::emptyMap();
-		grid[GRID_VALUE] = std::string("mynewgridname");
-		LLGridManager::getInstance()->addGrid(grid);
-		LLGridManager::getInstance()->saveFavorites();
-		// validate we didn't lose existing favorites
-		LLGridManager::getInstance()->initialize("grid_test.xml");
-		std::map<std::string, std::string> known_grids = LLGridManager::getInstance()->getKnownGrids();
-		ensure("New grid wasn't added to persisted list after being marked a favorite",
-			   known_grids.find(std::string("grid1")) !=
-			   known_grids.end());
-		
-		// add a grid
-		LLGridManager::getInstance()->addGrid(grid);
-		LLGridManager::getInstance()->setGridChoice("mynewgridname");
-		LLGridManager::getInstance()->setFavorite();
-		LLGridManager::getInstance()->saveFavorites();
-		known_grids = LLGridManager::getInstance()->getKnownGrids();
-		ensure("New grid wasn't added to persisted list after being marked a favorite",
-			   known_grids.find(std::string("grid1")) !=
-			   known_grids.end());
-		known_grids = LLGridManager::getInstance()->getKnownGrids();
-		ensure("New grid wasn't added to persisted list after being marked a favorite",
-			   known_grids.find(std::string("mynewgridname")) !=
-			   known_grids.end());
+
+		LLGridManager::getInstance()->setGridChoice("altgrid.long.name");
+		ensure_equals("getGridLabel",
+					  LLGridManager::getInstance()->getGridLabel(),
+					  std::string("Alternative Grid"));
+		ensure_equals("getGridId",
+					  LLGridManager::getInstance()->getGridId(),
+					  std::string("AltGrid"));
+		ensure("alternative grid is not a system grid",
+			   !LLGridManager::getInstance()->isSystemGrid());
+		ensure("alternative grid is not a production grid",
+			   !LLGridManager::getInstance()->isInProductionGrid());
 	}
+
 }