diff options
| -rw-r--r-- | indra/newview/lllogininstance.cpp | 14 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 3 |
2 files changed, 13 insertions, 4 deletions
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp index 2427f620de..e81d2cc082 100644 --- a/indra/newview/lllogininstance.cpp +++ b/indra/newview/lllogininstance.cpp @@ -58,6 +58,7 @@ #include "llevents.h" #include "llappviewer.h" #include "llsdserialize.h" +#include "lltrans.h" #include <boost/scoped_ptr.hpp> #include <sstream> @@ -364,16 +365,21 @@ void LLLoginInstance::handleLoginFailure(const LLSD& event) << LL_ENDL; login_version = vvm_version; } - if (relnotes.empty()) + if (relnotes.empty() || relnotes.find("://") == std::string::npos) { - // I thought this would be available in strings.xml or some such - relnotes = "https://secondlife.com/support/downloads/"; + relnotes = LLTrans::getString("RELEASE_NOTES_BASE_URL"); + if (!LLStringUtil::endsWith(relnotes, "/")) + relnotes += "/"; + relnotes += LLURI::escape(login_version) + ".html"; } if (gViewerWindow) gViewerWindow->setShowProgress(FALSE); - LLSD args(LLSDMap("VERSION", login_version)("URL", relnotes)); + LLSD args; + args["VERSION"] = login_version; + args["URL"] = relnotes; + if (updater.isUndefined()) { // If the updater failed to shake hands, better advise the user to diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 990bf0e93f..107330d618 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -4059,6 +4059,7 @@ Please download from https://secondlife.com/support/downloads/ type="alertmodal"> Version [VERSION] is required for login. Release notes: [URL] + Click OK to download and install. <tag>confirm</tag> <usetemplate @@ -4072,6 +4073,7 @@ Click OK to download and install. type="alertmodal"> Version [VERSION] has been downloaded and is ready to install. Release notes: [URL] + Click OK to install. <tag>confirm</tag> <usetemplate @@ -4085,6 +4087,7 @@ Click OK to install. type="alertmodal"> Version [VERSION] has been downloaded and is ready to install. Release notes: [URL] + Proceed? <tag>confirm</tag> <usetemplate |