DEV-21940 - Add five new dev grids to the viewer login panel. bharati, chandra, danu, parvati and skanda.

3 files changed, 45 insertions, 0 deletions

diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 924b27a24c..8125fb61c0 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -201,6 +201,26 @@ void LLLoginHandler::parse(const LLSD& queryMap)
 	{
 		grid_choice = GRID_INFO_ARUNA;
 	}
+	else if (queryMap["grid"].asString() == "bharati")
+	{
+		grid_choice = GRID_INFO_BHARATI;
+	}
+	else if (queryMap["grid"].asString() == "chandra")
+	{
+		grid_choice = GRID_INFO_CHANDRA;
+	}
+	else if (queryMap["grid"].asString() == "danu")
+	{
+		grid_choice = GRID_INFO_DANU;
+	}
+	else if (queryMap["grid"].asString() == "parvati")
+	{
+		grid_choice = GRID_INFO_PARVATI;
+	}
+	else if (queryMap["grid"].asString() == "skanda")
+	{
+		grid_choice = GRID_INFO_SKANDA;
+	}
 
 	if(grid_choice != GRID_INFO_NONE)
 	{
diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp
index abdb91a79c..b244a2f318 100644
--- a/indra/newview/llviewernetwork.cpp
+++ b/indra/newview/llviewernetwork.cpp
@@ -58,10 +58,22 @@ static LLGridData gGridInfo[GRID_INFO_COUNT] =
 	  "util.aruna.lindenlab.com",
 	  "https://login.aruna.lindenlab.com/cgi-bin/login.cgi",
 	  "http://aruna-secondlife.webdev.lindenlab.com/helpers/" },
+	{ "Bharati",
+	  "util.bharati.lindenlab.com",
+	  "https://login.bharati.lindenlab.com/cgi-bin/login.cgi",
+	  "http://bharati-secondlife.webdev.lindenlab.com/helpers/" },
+	{ "Chandra",
+	  "util.chandra.lindenlab.com",
+	  "https://login.chandra.lindenlab.com/cgi-bin/login.cgi",
+	  "http://chandra-secondlife.webdev.lindenlab.com/helpers/" },
 	{ "Damballah",
 	  "util.damballah.lindenlab.com",
 	  "https://login.damballah.lindenlab.com/cgi-bin/login.cgi",
 	  "http://damballah-secondlife.webdev.lindenlab.com/helpers/" },
+	{ "Danu",
+	  "util.danu.lindenlab.com",
+	  "https://login.danu.lindenlab.com/cgi-bin/login.cgi",
+	  "http://danu-secondlife.webdev.lindenlab.com/helpers/" },
 	{ "Durga",
 	  "util.durga.lindenlab.com",
 	  "https://login.durga.lindenlab.com/cgi-bin/login.cgi",
@@ -82,6 +94,10 @@ static LLGridData gGridInfo[GRID_INFO_COUNT] =
 	  "util.nandi.lindenlab.com",
 	  "https://login.nandi.lindenlab.com/cgi-bin/login.cgi",
 	  "http://nandi-secondlife.webdev.lindenlab.com/helpers/" },
+	{ "Parvati",
+	  "util.parvati.lindenlab.com",
+	  "https://login.parvati.lindenlab.com/cgi-bin/login.cgi",
+	  "http://parvati-secondlife.webdev.lindenlab.com/helpers/" },
 	{ "Radha",
 	  "util.radha.lindenlab.com",
 	  "https://login.radha.lindenlab.com/cgi-bin/login.cgi",
@@ -98,6 +114,10 @@ static LLGridData gGridInfo[GRID_INFO_COUNT] =
 	  "util.shakti.lindenlab.com",
 	  "https://login.shakti.lindenlab.com/cgi-bin/login.cgi",
 	  "http://shakti-secondlife.webdev.lindenlab.com/helpers/" },
+	{ "Skanda",
+	  "util.skanda.lindenlab.com",
+	  "https://login.skanda.lindenlab.com/cgi-bin/login.cgi",
+	  "http://skanda-secondlife.webdev.lindenlab.com/helpers/" },
 	{ "Soma",
 	  "util.soma.lindenlab.com",
 	  "https://login.soma.lindenlab.com/cgi-bin/login.cgi",
diff --git a/indra/newview/llviewernetwork.h b/indra/newview/llviewernetwork.h
index 0594fc8b4a..ca11a99cfe 100644
--- a/indra/newview/llviewernetwork.h
+++ b/indra/newview/llviewernetwork.h
@@ -41,16 +41,21 @@ enum EGridInfo
 	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,