diff options
| author | Northspring <pantera.polnocy@phoenixviewer.com> | 2015-04-15 00:23:36 +0200 |
|---|---|---|
| committer | Northspring <pantera.polnocy@phoenixviewer.com> | 2015-04-15 00:23:36 +0200 |
| commit | 49630f6bf56db8b2561d99cd71cfcf2b7bee9f90 (patch) | |
| tree | 2b44d1dde9392cf2e5eaa9cb60d2033f0d9bc355 /indra/newview/llstartup.cpp | |
| parent | 079ad3b5767c444a29f97ca2e6b27fdb28f4b116 (diff) | |
| parent | a647b8f1cbab13f07ea889c80df28414bc906129 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rwxr-xr-x | indra/newview/llstartup.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index d5f9268a64..42fc300187 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1352,11 +1352,11 @@ bool idle_startup() { LLStringUtil::format_map_t args; args["[NUMBER]"] = llformat("%d", num_retries + 1); - set_startup_status(0.4f, LLTrans::getString("LoginRetrySeedCapGrant", args), gAgent.mMOTD); + set_startup_status(0.4f, LLTrans::getString("LoginRetrySeedCapGrant", args), gAgent.mMOTD.c_str()); } else { - set_startup_status(0.4f, LLTrans::getString("LoginRequestSeedCapGrant"), gAgent.mMOTD); + set_startup_status(0.4f, LLTrans::getString("LoginRequestSeedCapGrant"), gAgent.mMOTD.c_str()); } } display_startup(); @@ -2070,7 +2070,7 @@ bool idle_startup() update_texture_fetch(); set_startup_status(0.60f + 0.30f * timeout_frac, LLTrans::getString("LoginPrecaching"), - gAgent.mMOTD); + gAgent.mMOTD.c_str()); display_startup(); } |