diff options
| author | Rider Linden <none@none> | 2015-04-15 11:54:18 -0700 |
|---|---|---|
| committer | Rider Linden <none@none> | 2015-04-15 11:54:18 -0700 |
| commit | 109e2db131514de43a2d61da1cc4ee78dc89f858 (patch) | |
| tree | 217ca4b42ee516dab39198661e2bc91514a5a8e5 /indra/newview/llstartup.cpp | |
| parent | 176d8cd268611e28c07a462df3027f4872456e5a (diff) | |
| parent | 82ae214f6a367e17dd335e80e2444cf672108821 (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(); } |