livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix --autologin command line option. FIRE-13543 

--HG--
branch : Firestorm_4.6.5
ziree 2014-04-25 01:39:56 +02:00
parent 022c669fca
commit c7ccc612de
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llloginhandler.cpp
View File

@ -200,5 +200,9 @@ LLPointer<LLCredential> LLLoginHandler::loadSavedUserLoginInfo()
return gSecAPIHandler->createCredential(identifier["first_name"].asString() + " " + identifier["last_name"].asString() + "@" +LLGridManager::getInstance()->getGrid(),
identifier, authenticator);
}
return NULL;
// <FS:Zi> Fix --autologin by loading the currently selected credentials if the above fails.
// UserLoginInfo contains "First Last @ Grid" and gets set in LLPanelLogin::onClickConnect()
// return NULL;
return gSecAPIHandler->loadCredential(gSavedSettings.getLLSD("UserLoginInfo"));
// </FS:Zi>
}