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

Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer

meow-7.2.2
Ansariel 2020-11-12 17:06:16 +01:00
parent daec926a54 dfc406f0ff
commit 3b630f2cda
5 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
autobuild.xml
View File

@ -3394,9 +3394,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>c5ab9d9d7482e48cd76f4bf391900a8c</string>
<string>dfef4288f26457f7d41bb17768cc88d4</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/43369/385585/viewer_manager-2.0.531000-darwin64-531000.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/71888/695068/viewer_manager-2.0.551854-darwin64-551854.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
@ -3430,9 +3430,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>6b10d7407686d9e12e63576256581e3e</string>
<string>d6d3081c7da304b24e9ff39452bae563</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/43370/385592/viewer_manager-2.0.531000-windows-531000.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/71889/695075/viewer_manager-2.0.551854-windows-551854.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -3443,7 +3443,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>source_type</key>
<string>hg</string>
<key>version</key>
<string>2.0.531000</string>
<string>2.0.551854</string>
</map>
<key>vlc-bin</key>
<map>

BIN
indra/newview/installers/windows/install_icon.BMP
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 256 KiB

After

Width:  |  Height:  |  Size: 128 KiB

BIN
indra/newview/installers/windows/uninstall_icon.BMP
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 256 KiB

After

Width:  |  Height:  |  Size: 128 KiB

26
indra/newview/lllogininstance.cpp
View File

@ -347,7 +347,7 @@ void LLLoginInstance::handleLoginFailure(const LLSD& event)
{
data["certificate"] = response["certificate"];
}
if (gViewerWindow)
gViewerWindow->setShowProgress(FALSE, FALSE);
LLFloaterReg::showInstance("message_critical", data);
@ -363,13 +363,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, 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

@ -4148,6 +4148,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"
@ -4165,6 +4167,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
@ -4177,6 +4180,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
@ -4189,6 +4193,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