4 files changed, 23 insertions, 146 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 9b3e11c..8bee793 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,15 @@
+2008-11-24  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/llpanellogin.cpp: 
+        Changed the grid selector options at login.
+        Renamed "Agni" to "SL Main Grid", etc. and removed private
+        LL grids from the list. Also added "Local OpenSim" option.
+        * linden/indra/newview/llviewernetwork.cpp: 
+        Ditto.
+        * linden/indra/newview/llviewernetwork.h: 
+        Ditto.
+
+
 2008-11-21  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * linden/indra/newview/lldrawable.cpp:
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 61bf215..86dab63 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -134,74 +134,14 @@ void LLLoginHandler::parse(const LLSD& queryMap)
         mLastName = queryMap["last_name"].asString();
         
         EGridInfo grid_choice = GRID_INFO_NONE;
-        if (queryMap["grid"].asString() == "aditi")
+        if (queryMap["grid"].asString() == "sl beta grid")
         {
                 grid_choice = GRID_INFO_ADITI;
         }
-        else if (queryMap["grid"].asString() == "agni")
+        else if (queryMap["grid"].asString() == "sl main grid")
         {
                 grid_choice = GRID_INFO_AGNI;
         }
-        else if (queryMap["grid"].asString() == "siva")
-        {
-                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)
         {
diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp
index 13d432a..7d1d351 100644
--- a/linden/indra/newview/llviewernetwork.cpp
+++ b/linden/indra/newview/llviewernetwork.cpp
@@ -46,81 +46,21 @@ struct LLGridData
 static LLGridData gGridInfo[GRID_INFO_COUNT] = 
 {
         { "None", "", "", ""},
-        { "Aditi", 
-          "util.aditi.lindenlab.com", 
+        { "SL Beta Grid",
+          "util.aditi.lindenlab.com",
           "https://login.aditi.lindenlab.com/cgi-bin/login.cgi",
           "http://aditi-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Agni", 
+        { "SL Main Grid",
           "util.agni.lindenlab.com", 
           "https://login.agni.lindenlab.com/cgi-bin/login.cgi",
           "https://secondlife.com/helpers/" },
-        { "Aruna",
-          "util.aruna.lindenlab.com",
-          "https://login.aruna.lindenlab.com/cgi-bin/login.cgi",
-          "http://aruna-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/" },
-        { "Durga",
-          "util.durga.lindenlab.com",
-          "https://login.durga.lindenlab.com/cgi-bin/login.cgi",
-          "http://durga-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Ganga",
-          "util.ganga.lindenlab.com",
-          "https://login.ganga.lindenlab.com/cgi-bin/login.cgi",
-          "http://ganga-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Mitra",
-          "util.mitra.lindenlab.com",
-          "https://login.mitra.lindenlab.com/cgi-bin/login.cgi",
-          "http://mitra-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Mohini",
-          "util.mohini.lindenlab.com",
-          "https://login.mohini.lindenlab.com/cgi-bin/login.cgi",
-          "http://mohini-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Nandi",
-          "util.nandi.lindenlab.com",
-          "https://login.nandi.lindenlab.com/cgi-bin/login.cgi",
-          "http://nandi-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Radha",
-          "util.radha.lindenlab.com",
-          "https://login.radha.lindenlab.com/cgi-bin/login.cgi",
-          "http://radha-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Ravi",
-          "util.ravi.lindenlab.com",
-          "https://login.ravi.lindenlab.com/cgi-bin/login.cgi",
-          "http://ravi-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Siva", 
-          "util.siva.lindenlab.com",
-          "https://login.siva.lindenlab.com/cgi-bin/login.cgi",
-          "http://siva-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Shakti",
-          "util.shakti.lindenlab.com",
-          "https://login.shakti.lindenlab.com/cgi-bin/login.cgi",
-          "http://shakti-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Soma",
-          "util.soma.lindenlab.com",
-          "https://login.soma.lindenlab.com/cgi-bin/login.cgi",
-          "http://soma-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Uma",
-          "util.uma.lindenlab.com",
-          "https://login.uma.lindenlab.com/cgi-bin/login.cgi",
-          "http://uma-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Vaak",
-          "util.vaak.lindenlab.com",
-          "https://login.vaak.lindenlab.com/cgi-bin/login.cgi",
-          "http://vaak-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Yami",
-          "util.yami.lindenlab.com",
-          "https://login.yami.lindenlab.com/cgi-bin/login.cgi",
-          "http://yami-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Local", 
-          "localhost", 
-          "https://login.dmz.lindenlab.com/cgi-bin/login.cgi",
+        { "Local OpenSim",
+          "localhost",
+          "http://0.0.0.0:9000",
           "" },
-        { "Other", 
-          "", 
-          "https://login.dmz.lindenlab.com/cgi-bin/login.cgi",
+        { "Other",
+          "",
+          "",
           "" }
 };
 
diff --git a/linden/indra/newview/llviewernetwork.h b/linden/indra/newview/llviewernetwork.h
index 53bb0ab..e39507d 100644
--- a/linden/indra/newview/llviewernetwork.h
+++ b/linden/indra/newview/llviewernetwork.h
@@ -40,21 +40,6 @@ enum EGridInfo
         GRID_INFO_NONE,
         GRID_INFO_ADITI,
         GRID_INFO_AGNI,
-        GRID_INFO_ARUNA,
-        GRID_INFO_DAMBALLAH,
-        GRID_INFO_DURGA,
-        GRID_INFO_GANGA,
-        GRID_INFO_MITRA,
-        GRID_INFO_MOHINI,
-        GRID_INFO_NANDI,
-        GRID_INFO_RADHA,
-        GRID_INFO_RAVI,
-        GRID_INFO_SIVA,
-        GRID_INFO_SHAKTI,
-        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