diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2010-06-10 15:37:20 -0700 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-06-10 15:37:20 -0700 |
| commit | 1065cce5e9db1bd18c2b485024ad360e48cedee2 (patch) | |
| tree | 19c6f8bbc017686731dfbf6bc45e479658f53189 /indra | |
| parent | 41bee5cfe8bd0b83fdc93cd1541f3fc82ecb6aab (diff) | |
| parent | d8adbf8438765dc994aeb2208c45e71184fc0347 (diff) | |
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-release
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llxmlrpctransaction.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llxmlrpctransaction.cpp b/indra/newview/llxmlrpctransaction.cpp index a8ac0c0c90..1d10ec7b28 100644 --- a/indra/newview/llxmlrpctransaction.cpp +++ b/indra/newview/llxmlrpctransaction.cpp @@ -513,7 +513,7 @@ void LLXMLRPCTransaction::Impl::setStatus(EStatus status, // Usually this means that there's a problem with the login server, // not with the client. Direct user to status page. mStatusMessage = LLTrans::getString("server_is_down"); - mStatusURI = "http://secondlife.com/status/"; + mStatusURI = "http://status.secondlifegrid.net/"; } } } diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 361af0e8fb..294267d43b 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3186,7 +3186,7 @@ Abuse Report</string> <string name="server_is_down"> Despite our best efforts, something unexpected has gone wrong. - Please check secondlife.com/status to see if there is a known problem with the service. + Please check status.secondlifegrid.net to see if there is a known problem with the service. If you continue to experience problems, please check your network and firewall setup. </string> |