2 files changed, 10 insertions, 18 deletions

diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 026b0b2..27e6043 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -1163,18 +1163,13 @@ void LLPanelLogin::onSelectServer(LLUICtrl* ctrl, void*)
         std::string mCurGrid = ctrl->getValue().asString();
         //KOW
         gHippoGridManager->setCurrentGrid(mCurGrid);
-        HippoGridInfo *gridInfo = gHippoGridManager->getGrid(mCurGrid);
-                if (gridInfo) {
-                        //childSetText("gridnick", gridInfo->getGridNick());
-                        //platform->setCurrentByIndex(gridInfo->getPlatform());
-                        //childSetText("gridname", gridInfo->getGridName());
-                        LLPanelLogin::setFields( gridInfo->getFirstName(), gridInfo->getLastName(), gridInfo->getAvatarPassword(), 1 );
-                }
-        //gHippoGridManager->setCurrentGrid(mCurGrid);
-
-
-        
-
+        // HippoGridInfo *gridInfo = gHippoGridManager->getGrid(mCurGrid);
+        // if (gridInfo) {
+        //      //childSetText("gridnick", gridInfo->getGridNick());
+        //      //platform->setCurrentByIndex(gridInfo->getPlatform());
+        //      //childSetText("gridname", gridInfo->getGridName());
+        //      LLPanelLogin::setFields( gridInfo->getFirstName(), gridInfo->getLastName(), gridInfo->getAvatarPassword(), 1 );
+        // }
 
         
         llwarns << "current grid = " << mCurGrid << llendl;
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index d6dff01..9b46054 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -705,12 +705,9 @@ bool idle_startup()
                 else
                 {
                         // if not automatically logging in, display login dialog
-                        // a valid grid is selected (in llpanellogin, for some reason?)
-                        // This should get the right values from the grid manager now -Patrick Sapinski (Monday, August 17, 2009)
-                        HippoGridInfo *gridInfo = gHippoGridManager->getCurrentGrid();
-                        firstname = gridInfo->getFirstName();
-                        lastname = gridInfo->getLastName();
-                        password = gridInfo->getAvatarPassword();
+                        firstname = gSavedSettings.getString("FirstName");
+                        lastname = gSavedSettings.getString("LastName");
+                        password = load_password_from_disk();
                         
                         remember_password = gSavedSettings.getBOOL("RememberPassword");
                         show_connect_box = true;