diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-04-03 00:16:59 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-04-03 00:16:59 +0000 |
| commit | aa96d1fddff3d5bf68a5014229a0d20584937222 (patch) | |
| tree | b1323a508ebe6e94dbc573ddf2a13a303517b533 /indra/newview/llstartup.cpp | |
| parent | 992de40c7765e5b7f290f1fc73030ccf3566c352 (diff) | |
merge -r 59337:59951 Branch_1-14-0 -> release.
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index f315869437..d57292e23d 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -614,6 +614,8 @@ BOOL idle_startup() if (STATE_LOGIN_SHOW == gStartupState) { + llinfos << "Initializing Window" << llendl; + gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW); // Push our window frontmost gViewerWindow->getWindow()->show(); @@ -2531,13 +2533,19 @@ BOOL idle_startup() void login_show() { + llinfos << "Initializing Login Screen" << llendl; + LLPanelLogin::show( gViewerWindow->getVirtualWindowRect(), gSavedSettings.getBOOL("UseDebugLogin"), login_callback, NULL ); + llinfos << "Decoding Images" << llendl; + // Make sure all the UI textures are present and decoded. gImageList.decodeAllImages(2.f); + llinfos << "Setting Servers" << llendl; + if( USERSERVER_OTHER == gUserServerChoice ) { LLPanelLogin::addServer( gUserServerName, USERSERVER_OTHER ); |