diff options
| author | James Cook <james@lindenlab.com> | 2010-05-26 10:53:59 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-05-26 10:53:59 -0700 |
| commit | 0ebdba45f6fbcecfe0aa63bb37ddcde2efba6d87 (patch) | |
| tree | dcfb58e0756c0034075345363559e068f53e8f2a /indra/newview/llxmlrpctransaction.cpp | |
| parent | dd672e6dfbe6347e7498fb32b9cade6a2133f4a8 (diff) | |
| parent | 74279f551b84a409af52634df4b7d78294a818dc (diff) | |
Merge with dessie/viewer-public to get Callum's webkit changes
Diffstat (limited to 'indra/newview/llxmlrpctransaction.cpp')
| -rw-r--r-- | indra/newview/llxmlrpctransaction.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llxmlrpctransaction.cpp b/indra/newview/llxmlrpctransaction.cpp index da61840761..bc7f8ec854 100644 --- a/indra/newview/llxmlrpctransaction.cpp +++ b/indra/newview/llxmlrpctransaction.cpp @@ -45,6 +45,7 @@ #include <xmlrpc-epi/xmlrpc.h> #include "llappviewer.h" +#include "lltrans.h" // Static instance of LLXMLRPCListener declared here so that every time we // bring in this code, we instantiate a listener. If we put the static @@ -510,11 +511,7 @@ void LLXMLRPCTransaction::Impl::setStatus(EStatus status, default: // Usually this means that there's a problem with the login server, // not with the client. Direct user to status page. - mStatusMessage = - "Despite our best efforts, something unexpected has gone wrong. \n" - " \n" - "Please check secondlife.com/status \n" - "to see if there is a known problem with the service."; + mStatusMessage = LLTrans::getString("server_is_down"); mStatusURI = "http://secondlife.com/status/"; } |