diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-07-22 14:53:55 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-07-22 14:53:55 -0700 |
| commit | db7f15df68cda2850c3d8a7ffcc59fc136de6f95 (patch) | |
| tree | af877fdeffe37eb8ea9b3cd1e73dca6e1c572d09 /indra/newview/llstartup.cpp | |
| parent | 89dcba8b82fd0ce2c878b73fcef445a43d841115 (diff) | |
Adding LLLoginInstance unit test
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index f0f056652a..dac6f8423a 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -965,13 +965,17 @@ bool idle_startup() display_startup(); // Setting initial values... + LLLoginInstance* login = LLLoginInstance::getInstance(); if(gNoRender) { // HACK, skip optional updates if you're running drones - LLLoginInstance::getInstance()->setSkipOptionalUpdate(true); + login->setSkipOptionalUpdate(true); } - LLLoginInstance::getInstance()->setUserInteraction(show_connect_box); + login->setUserInteraction(show_connect_box); + login->setSerialNumber(LLAppViewer::instance()->getSerialNumber()); + login->setLastExecEvent(gLastExecEvent); + login->setUpdaterLauncher(boost::bind(LLAppViewer::launchUpdater, LLAppViewer::instance())); // This call to LLLoginInstance::connect() starts the // authentication process. @@ -979,7 +983,7 @@ bool idle_startup() credentials["first"] = gFirstname; credentials["last"] = gLastname; credentials["passwd"] = gPassword; - LLLoginInstance::getInstance()->connect(credentials); + login->connect(credentials); LLStartUp::setStartupState( STATE_LOGIN_PROCESS_RESPONSE ); return FALSE; |