1 files changed, 14 insertions, 5 deletions

diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index feb85a7..63f76dc 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -626,7 +626,16 @@ void LLPanelLogin::addServer(const std::string& server)
                         i++;
                 }
         }
-        grids->setCurrentByIndex(0);
+        
+        // when you first login select the default, otherwise last connected
+        if (gDisconnected)
+        {
+                grids->setSimple(gHippoGridManager->getCurrentGrid()->getGridNick());
+        }
+        else
+        {
+                grids->setSimple(defaultGrid);
+        }
 
         //LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
         //combo->add(server, LLSD(domain_name) );
@@ -767,13 +776,13 @@ void LLPanelLogin::refreshLoginPage()
     if (!sInstance) return;
 
     sInstance->childSetVisible("create_new_account_text",
-        !gHippoGridManager->getConnectedGrid()->getRegisterUrl().empty());
+        !gHippoGridManager->getCurrentGrid()->getRegisterUrl().empty());
     sInstance->childSetVisible("forgot_password_text",
-        !gHippoGridManager->getConnectedGrid()->getPasswordUrl().empty());
+        !gHippoGridManager->getCurrentGrid()->getPasswordUrl().empty());
 
     // kick off a request to grab the url manually
         gResponsePtr = LLIamHereLogin::build(sInstance);
-        std::string login_page = gHippoGridManager->getConnectedGrid()->getLoginPage();
+        std::string login_page = gHippoGridManager->getCurrentGrid()->getLoginPage();
         if (!login_page.empty()) {
                 LLHTTPClient::head(login_page, gResponsePtr);
         } else {
@@ -787,7 +796,7 @@ void LLPanelLogin::loadLoginPage()
         if (!sInstance) return;
         
 
-        std::string login_page = gHippoGridManager->getConnectedGrid()->getLoginPage();
+        std::string login_page = gHippoGridManager->getCurrentGrid()->getLoginPage();
         if (login_page.empty()) {
                 sInstance->setSiteIsAlive(false);
                 return;