livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automated merge with ssh://bitbucket.org/lindenlab/viewer-release

meow-7.2.2
Nat Goodspeed 2019-11-21 16:26:37 -05:00
parent 78bdf57ad6 399da9f891
commit 1cf9b1c279
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
indra/newview/lllogininstance.cpp
View File

@ -332,7 +332,7 @@ void LLLoginInstance::handleLoginFailure(const LLSD& event)
{
data["certificate"] = response["certificate"];
}
if (gViewerWindow)
gViewerWindow->setShowProgress(FALSE);
@ -349,13 +349,31 @@ void LLLoginInstance::handleLoginFailure(const LLSD& event)
// login.cgi is insisting on a required update. We were called with an
// event that bundles both the login.cgi 'response' and the
// synchronization event from the 'updater'.
std::string required_version = response["message_args"]["VERSION"];
LL_WARNS("LLLogin") << "Login failed because an update to version " << required_version << " is required." << LL_ENDL;
std::string login_version = response["message_args"]["VERSION"];
std::string vvm_version = updater["VERSION"];
std::string relnotes = updater["URL"];
LL_WARNS("LLLogin") << "Login failed because an update to version " << login_version << " is required." << LL_ENDL;
// vvm_version might be empty because we might not have gotten
// SLVersionChecker's LoginSync handshake. But if it IS populated, it
// should (!) be the same as the version we got from login.cgi.
if ((! vvm_version.empty()) && vvm_version != login_version)
{
LL_WARNS("LLLogin") << "VVM update version " << vvm_version
<< " differs from login version " << login_version
<< "; presenting VVM version to match release notes URL"
<< LL_ENDL;
login_version = vvm_version;
}
if (relnotes.empty())
{
// I thought this would be available in strings.xml or some such
relnotes = "https://secondlife.com/support/downloads/";
}
if (gViewerWindow)
gViewerWindow->setShowProgress(FALSE);
LLSD args(LLSDMap("VERSION", required_version));
LLSD args(LLSDMap("VERSION", login_version)("URL", relnotes));
if (updater.isUndefined())
{
// If the updater failed to shake hands, better advise the user to

5
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -3906,6 +3906,8 @@ Finished download of raw terrain file to:
[DOWNLOAD_PATH].
</notification>
<!-- RequiredUpdate does not display release notes URL because we don't get
that from login.cgi's login failure message. -->
<notification
icon="alertmodal.tga"
name="RequiredUpdate"
@ -3923,6 +3925,7 @@ Please download from https://secondlife.com/support/downloads/
name="PauseForUpdate"
type="alertmodal">
Version [VERSION] is required for login.
Release notes: [URL]
Click OK to download and install.
<tag>confirm</tag>
<usetemplate
@ -3935,6 +3938,7 @@ Click OK to download and install.
name="OptionalUpdateReady"
type="alertmodal">
Version [VERSION] has been downloaded and is ready to install.
Release notes: [URL]
Click OK to install.
<tag>confirm</tag>
<usetemplate
@ -3947,6 +3951,7 @@ Click OK to install.
name="PromptOptionalUpdate"
type="alertmodal">
Version [VERSION] has been downloaded and is ready to install.
Release notes: [URL]
Proceed?
<tag>confirm</tag>
<usetemplate