summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorIgor Borovkov <iborovkov@productengine.com>2010-03-16 14:49:20 +0200
committerIgor Borovkov <iborovkov@productengine.com>2010-03-16 14:49:20 +0200
commit5675afccbb30d44f367dd50d99b41fcf64c9c4f9 (patch)
tree0913ef4d38d50a6167b2890bd1e5e9acbaf58ff5 /indra/newview
parent04e692b3f1fbd98bc9fabc76e258c89b95458468 (diff)
fixed EXT-6363 [HARD CODED] "Login Failed." is hardcoded
moved out "Login failed." to strings.xml Reviewed by Q at https://codereview.productengine.com/secondlife/r/27/ --HG-- branch : product-engine
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llstartup.cpp2
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml1
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 025dd6029a..d4d6a74f0c 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1040,7 +1040,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(): "
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4940c2f5d9..4b9140ee90 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -47,6 +47,7 @@
<string name="LoginConnectingToRegion">Connecting to region...</string>
<string name="LoginDownloadingClothing">Downloading clothing...</string>
<string name="LoginFailedNoNetwork">Network Error: Could not establish connection, please check your network connection.</string>
+ <string name="LoginFailed">Login failed.</string>
<string name="Quit">Quit</string>
<string name="create_account_url">http://join.secondlife.com/</string>