summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-03-22 16:12:41 -0700
committerRoxie Linden <roxie@lindenlab.com>2010-03-22 16:12:41 -0700
commit18b7ab0018695e261dbc5058d76f9d371958b034 (patch)
tree9b4baa5a5ca563ace1b06ac6b3df9fd9c0a0d0f7 /indra/newview/llstartup.cpp
parent60c4621500e478d66a8bdc3a1c80573be2860fee (diff)
parentbe139dfb957e1b0d3c59110284c43630d3b57d23 (diff)
Weekly automated merge from viewer 2.0
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 6860da1bd2..a726d8c476 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -986,7 +986,7 @@ bool idle_startup()
if(STATE_LOGIN_PROCESS_RESPONSE == LLStartUp::getStartupState())
{
std::ostringstream emsg;
- emsg << "Login failed.\n";
+ emsg << LLTrans::getString("LoginFailed") << "\n";
if(LLLoginInstance::getInstance()->authFailure())
{
LL_INFOS("LLStartup") << "Login failed, LLLoginInstance::getResponse(): "