1 files changed, 3 insertions, 68 deletions

diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 61bf215..09e2cee 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)
         {
@@ -849,12 +789,7 @@ void LLPanelLogin::refreshLocation( bool force_visible )
         sInstance->childSetVisible("start_location_combo", show_start);
         sInstance->childSetVisible("start_location_text", show_start);
 
-#if LL_RELEASE_FOR_DOWNLOAD
-        BOOL show_server = gSavedSettings.getBOOL("ForceShowGrid");
-        sInstance->childSetVisible("server_combo", show_server);
-#else
         sInstance->childSetVisible("server_combo", TRUE);
-#endif
 
 #endif
 }
@@ -937,7 +872,7 @@ void LLPanelLogin::loadLoginPage()
         curl_free(curl_version);
 
         // Grid
-        char* curl_grid = curl_escape(LLViewerLogin::getInstance()->getGridLabel().c_str(), 0);
+        char* curl_grid = curl_escape(LLViewerLogin::getInstance()->getGridCodeName().c_str(), 0);
         oStr << "&grid=" << curl_grid;
         curl_free(curl_grid);