diff --git a/indra/newview/llloginhandler.cpp b/indra/newview/llloginhandler.cpp
index 390f36091..38d48c976 100644
--- a/indra/newview/llloginhandler.cpp
+++ b/indra/newview/llloginhandler.cpp
@@ -84,15 +84,71 @@ void LLLoginHandler::parse(const LLSD& queryMap)
 	{
 		 grid_choice = GRID_INFO_AGNI;
 	}
-	else if (queryMap["grid"].asString() == "inworldz")
+	else if (queryMap["grid"].asString() == "siva")
 	{
-		 grid_choice = GRID_INFO_INWORLDZ;
-		 LLViewerLogin::getInstance()->setLoginPageURI("http://inworldz.com/loginscreen.php"); //lazy as FUCK
+		 grid_choice = GRID_INFO_SIVA;
+	}
+	else if (queryMap["grid"].asString() == "damballah")
+	{
+		 grid_choice = GRID_INFO_DAMBALLAH;
+	}
+	else if (queryMap["grid"].asString() == "durga")
+	{
+		 grid_choice = GRID_INFO_DURGA;
+	}
+	else if (queryMap["grid"].asString() == "shakti")
+	{
+		 grid_choice = GRID_INFO_SHAKTI;
+	}
+	else if (queryMap["grid"].asString() == "soma")
+	{
+		 grid_choice = GRID_INFO_SOMA;
+	}
+	else if (queryMap["grid"].asString() == "ganga")
+	{
+		 grid_choice = GRID_INFO_GANGA;
+	}
+	else if (queryMap["grid"].asString() == "vaak")
+	{
+		 grid_choice = GRID_INFO_VAAK;
+	}
+	else if (queryMap["grid"].asString() == "uma")
+	{
+		 grid_choice = GRID_INFO_UMA;
+	}
+	else if (queryMap["grid"].asString() == "mohini")
+	{
+		 grid_choice = GRID_INFO_MOHINI;
+	}
+	}
+	else if (queryMap["grid"].asString() == "yami")
+	{
+		 grid_choice = GRID_INFO_YAMI;
+	}
+	else if (queryMap["grid"].asString() == "nandi")
+	{
+		 grid_choice = GRID_INFO_NANDI;
+	}
+	else if (queryMap["grid"].asString() == "mitra")
+	{
+		 grid_choice = GRID_INFO_MITRA;
+	}
+	else if (queryMap["grid"].asString() == "radha")
+	{
+		 grid_choice = GRID_INFO_RADHA;
+	}
+	else if (queryMap["grid"].asString() == "ravi")
+	{
+		 grid_choice = GRID_INFO_RAVI;
+	}
+	else if (queryMap["grid"].asString() == "aruna")
+	{
+		 grid_choice = GRID_INFO_ARUNA;
 	}
 
 	if(grid_choice != GRID_INFO_NONE)
 	{
-		LLViewerLogin::getInstance()->setGridChoice((EGridInfo)grid_choice);
+		LLViewerLogin::getInstance()->setGridChoice((EGridChoice)grid_choice);
 	}
 
 	std::string startLocation = queryMap["location"].asString();
diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp
index eae29ce69..43b1a4aa9 100644
--- a/indra/newview/llviewernetwork.cpp
+++ b/indra/newview/llviewernetwork.cpp
@@ -55,10 +55,6 @@ static LLGridData gGridInfo[GRID_INFO_COUNT] =
 	  "util.agni.lindenlab.com", 
 	  "https://login.agni.lindenlab.com/cgi-bin/login.cgi",
 	  "https://secondlife.com/helpers/" },
-	{ "Inworldz", 
-	  "", 
-	  "http://inworldz.com:8002/",
-	  "http://inworldz.com/" },
 	{ "Local", 
 	  "localhost", 
 	  "https://login.dmz.lindenlab.com/cgi-bin/login.cgi",
diff --git a/indra/newview/llviewernetwork.h b/indra/newview/llviewernetwork.h
index bbebc63f7..56f268a5c 100644
--- a/indra/newview/llviewernetwork.h
+++ b/indra/newview/llviewernetwork.h
@@ -41,7 +41,26 @@ enum EGridInfo
 	GRID_INFO_NONE,
 	GRID_INFO_ADITI,
 	GRID_INFO_AGNI,
-	GRID_INFO_INWORLDZ,
+	GRID_INFO_ARUNA,
+	GRID_INFO_BHARATI,
+	GRID_INFO_CHANDRA,
+	GRID_INFO_DAMBALLAH,
+	GRID_INFO_DANU,
+	GRID_INFO_DURGA,
+	GRID_INFO_GANGA,
+	GRID_INFO_MITRA,
+	GRID_INFO_MOHINI,
+	GRID_INFO_NANDI,
+	GRID_INFO_PARVATI,
+	GRID_INFO_RADHA,
+	GRID_INFO_RAVI,
+	GRID_INFO_SIVA,
+	GRID_INFO_SHAKTI,
+	GRID_INFO_SKANDA,
+	GRID_INFO_SOMA,
+	GRID_INFO_UMA,
+	GRID_INFO_VAAK,
+	GRID_INFO_YAMI,
 	GRID_INFO_LOCAL,
 	GRID_INFO_OTHER, // IP address set via command line option
 	GRID_INFO_COUNT