From 4aa79ae145623b17b12d472c1c7d2261accaa403 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 25 Sep 2009 03:25:23 -0500 Subject: Login screen fields shouldn't be set from grid (for now). --- ChangeLog.txt | 6 ++++++ linden/indra/newview/llpanellogin.cpp | 19 +++++++------------ linden/indra/newview/llstartup.cpp | 9 +++------ 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index d0ded82..0847a49 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,11 @@ 2009-09-25 Jacek Antonelli + * Login screen fields shouldn't be set from grid (for now). + + modified: linden/indra/newview/llpanellogin.cpp + modified: linden/indra/newview/llstartup.cpp + + * Disabled avatar name and password fields in grid manager. Temporary, until we implement a decent account manager. 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; -- cgit v1.1