From 06352713b3b9de3a9040710577614df95f25457d Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Tue, 25 Nov 2008 18:58:24 -0600
Subject: Rearranged grid selectors so main grid is first.

---
 linden/indra/newview/llstartup.cpp       |  2 +-
 linden/indra/newview/llviewernetwork.cpp | 10 +++++-----
 linden/indra/newview/llviewernetwork.h   |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 0978fbb..625b1d8 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -2462,7 +2462,7 @@ void login_show()
 	LLPanelLogin::addServer(LLViewerLogin::getInstance()->getGridLabel(), LLViewerLogin::getInstance()->getGridChoice());
 
 	LLViewerLogin* vl = LLViewerLogin::getInstance();
-	for(int grid_index = GRID_INFO_ADITI; grid_index < GRID_INFO_OTHER; ++grid_index)
+	for(int grid_index = GRID_INFO_NONE + 1; grid_index < GRID_INFO_OTHER; ++grid_index)
 	{
 		LLPanelLogin::addServer(vl->getKnownGridLabel((EGridInfo)grid_index), grid_index);
 	}
diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp
index 7fb19af..5b423ff 100644
--- a/linden/indra/newview/llviewernetwork.cpp
+++ b/linden/indra/newview/llviewernetwork.cpp
@@ -47,16 +47,16 @@ struct LLGridData
 static LLGridData gGridInfo[GRID_INFO_COUNT] = 
 {
 	{ "None", "", "", "", "" },
-	{ "SL Beta Grid",
-	  "Aditi",
-	  "util.aditi.lindenlab.com",
-	  "https://login.aditi.lindenlab.com/cgi-bin/login.cgi",
-	  "http://aditi-secondlife.webdev.lindenlab.com/helpers/" },
 	{ "SL Main Grid",
 	  "Agni",
 	  "util.agni.lindenlab.com", 
 	  "https://login.agni.lindenlab.com/cgi-bin/login.cgi",
 	  "https://secondlife.com/helpers/" },
+	{ "SL Beta Grid",
+	  "Aditi",
+	  "util.aditi.lindenlab.com",
+	  "https://login.aditi.lindenlab.com/cgi-bin/login.cgi",
+	  "http://aditi-secondlife.webdev.lindenlab.com/helpers/" },
 	{ "Local OpenSim",
 	  "",
 	  "localhost",
diff --git a/linden/indra/newview/llviewernetwork.h b/linden/indra/newview/llviewernetwork.h
index 39ac879..970e2ce 100644
--- a/linden/indra/newview/llviewernetwork.h
+++ b/linden/indra/newview/llviewernetwork.h
@@ -38,8 +38,8 @@ class LLHost;
 enum EGridInfo
 {
 	GRID_INFO_NONE,
-	GRID_INFO_ADITI,
 	GRID_INFO_AGNI,
+	GRID_INFO_ADITI,
 	GRID_INFO_LOCAL,
 	GRID_INFO_OTHER, // IP address set via command line option
 	GRID_INFO_COUNT
-- 
cgit v1.1