From 5b1f162b049f056b808c24a501c30484cf9f8b30 Mon Sep 17 00:00:00 2001
From: Hazim Gazov <hazim.gazov@gmail.com>
Date: Mon, 3 May 2010 16:06:34 -0300
Subject: [PATCH] I did a bad thing.

---
 indra/newview/llloginhandler.cpp  | 64 ++-----------------------------
 indra/newview/llviewernetwork.cpp |  4 ++
 indra/newview/llviewernetwork.h   | 21 +---------
 3 files changed, 9 insertions(+), 80 deletions(-)

diff --git a/indra/newview/llloginhandler.cpp b/indra/newview/llloginhandler.cpp
index 38d48c976..390f36091 100644
--- a/indra/newview/llloginhandler.cpp
+++ b/indra/newview/llloginhandler.cpp
@@ -84,71 +84,15 @@ void LLLoginHandler::parse(const LLSD& queryMap)
 	{
 		 grid_choice = GRID_INFO_AGNI;
 	}
-	else if (queryMap["grid"].asString() == "siva")
+	else if (queryMap["grid"].asString() == "inworldz")
 	{
-		 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;
+		 grid_choice = GRID_INFO_INWORLDZ;
+		 LLViewerLogin::getInstance()->setLoginPageURI("http://inworldz.com/loginscreen.php"); //lazy as FUCK
 	}
 
 	if(grid_choice != GRID_INFO_NONE)
 	{
-		LLViewerLogin::getInstance()->setGridChoice((EGridChoice)grid_choice);
+		LLViewerLogin::getInstance()->setGridChoice((EGridInfo)grid_choice);
 	}
 
 	std::string startLocation = queryMap["location"].asString();
diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp
index 43b1a4aa9..eae29ce69 100644
--- a/indra/newview/llviewernetwork.cpp
+++ b/indra/newview/llviewernetwork.cpp
@@ -55,6 +55,10 @@ 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 56f268a5c..bbebc63f7 100644
--- a/indra/newview/llviewernetwork.h
+++ b/indra/newview/llviewernetwork.h
@@ -41,26 +41,7 @@ enum EGridInfo
 	GRID_INFO_NONE,
 	GRID_INFO_ADITI,
 	GRID_INFO_AGNI,
-	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_INWORLDZ,
 	GRID_INFO_LOCAL,
 	GRID_INFO_OTHER, // IP address set via command line option
 	GRID_INFO_COUNT