diff options
author | Jacek Antonelli | 2008-08-15 23:45:53 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:53 -0500 |
commit | eea0e92faa209f23b677fdee964023d0ce6f2fed (patch) | |
tree | f8700989d9f799d4e818920ba54516e7cf975376 /linden/indra/newview/llstartup.cpp | |
parent | Second Life viewer sources 1.20.7 (diff) | |
download | meta-impy-eea0e92faa209f23b677fdee964023d0ce6f2fed.zip meta-impy-eea0e92faa209f23b677fdee964023d0ce6f2fed.tar.gz meta-impy-eea0e92faa209f23b677fdee964023d0ce6f2fed.tar.bz2 meta-impy-eea0e92faa209f23b677fdee964023d0ce6f2fed.tar.xz |
Second Life viewer sources 1.20.8
Diffstat (limited to 'linden/indra/newview/llstartup.cpp')
-rw-r--r-- | linden/indra/newview/llstartup.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp index 52f4d1a..4dca600 100644 --- a/linden/indra/newview/llstartup.cpp +++ b/linden/indra/newview/llstartup.cpp | |||
@@ -1224,7 +1224,7 @@ BOOL idle_startup() | |||
1224 | sAuthUriNum++; | 1224 | sAuthUriNum++; |
1225 | std::ostringstream s; | 1225 | std::ostringstream s; |
1226 | LLString::format_map_t args; | 1226 | LLString::format_map_t args; |
1227 | args["[NUMBER]"] = sAuthUriNum + 1; | 1227 | args["[NUMBER]"] = llformat("%d", sAuthUriNum + 1); |
1228 | auth_desc = LLTrans::getString("LoginAttempt", args).c_str(); | 1228 | auth_desc = LLTrans::getString("LoginAttempt", args).c_str(); |
1229 | LLStartUp::setStartupState( STATE_LOGIN_AUTHENTICATE ); | 1229 | LLStartUp::setStartupState( STATE_LOGIN_AUTHENTICATE ); |
1230 | return do_normal_idle; | 1230 | return do_normal_idle; |
@@ -2329,7 +2329,7 @@ BOOL idle_startup() | |||
2329 | gDebugView->mFastTimerView->setVisible(TRUE); | 2329 | gDebugView->mFastTimerView->setVisible(TRUE); |
2330 | #endif | 2330 | #endif |
2331 | 2331 | ||
2332 | LLAppViewer::instance()->startMainloopTimeout(); | 2332 | LLAppViewer::instance()->initMainloopTimeout("Mainloop Init"); |
2333 | 2333 | ||
2334 | return do_normal_idle; | 2334 | return do_normal_idle; |
2335 | } | 2335 | } |