Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
3310fa57
Commit
3310fa57
authored
4 years ago
by
Andrey Kleshchev
Browse files
Options
Downloads
Patches
Plain Diff
Reapplied SL-11215: Add release notes URLs to update-related notifications.
In scope of SL-13740 work, this reverts commit
1935d25c
.
parent
5b023c8a
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/newview/lllogininstance.cpp
+22
-4
22 additions, 4 deletions
indra/newview/lllogininstance.cpp
indra/newview/skins/default/xui/en/notifications.xml
+5
-0
5 additions, 0 deletions
indra/newview/skins/default/xui/en/notifications.xml
with
27 additions
and
4 deletions
indra/newview/lllogininstance.cpp
+
22
−
4
View file @
3310fa57
...
@@ -349,13 +349,31 @@ void LLLoginInstance::handleLoginFailure(const LLSD& event)
...
@@ -349,13 +349,31 @@ void LLLoginInstance::handleLoginFailure(const LLSD& event)
// login.cgi is insisting on a required update. We were called with an
// login.cgi is insisting on a required update. We were called with an
// event that bundles both the login.cgi 'response' and the
// event that bundles both the login.cgi 'response' and the
// synchronization event from the 'updater'.
// synchronization event from the 'updater'.
std
::
string
required_version
=
response
[
"message_args"
][
"VERSION"
];
std
::
string
login_version
=
response
[
"message_args"
][
"VERSION"
];
LL_WARNS
(
"LLLogin"
)
<<
"Login failed because an update to version "
<<
required_version
<<
" is required."
<<
LL_ENDL
;
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
)
if
(
gViewerWindow
)
gViewerWindow
->
setShowProgress
(
FALSE
);
gViewerWindow
->
setShowProgress
(
FALSE
);
LLSD
args
(
LLSDMap
(
"VERSION"
,
required_version
));
LLSD
args
(
LLSDMap
(
"VERSION"
,
login_version
)(
"URL"
,
relnotes
));
if
(
updater
.
isUndefined
())
if
(
updater
.
isUndefined
())
{
{
// If the updater failed to shake hands, better advise the user to
// If the updater failed to shake hands, better advise the user to
...
...
This diff is collapsed.
Click to expand it.
indra/newview/skins/default/xui/en/notifications.xml
+
5
−
0
View file @
3310fa57
...
@@ -4039,6 +4039,8 @@ Finished download of raw terrain file to:
...
@@ -4039,6 +4039,8 @@ Finished download of raw terrain file to:
[DOWNLOAD_PATH].
[DOWNLOAD_PATH].
</notification>
</notification>
<!-- RequiredUpdate does not display release notes URL because we don't get
that from login.cgi's login failure message. -->
<notification
<notification
icon=
"alertmodal.tga"
icon=
"alertmodal.tga"
name=
"RequiredUpdate"
name=
"RequiredUpdate"
...
@@ -4056,6 +4058,7 @@ Please download from https://secondlife.com/support/downloads/
...
@@ -4056,6 +4058,7 @@ Please download from https://secondlife.com/support/downloads/
name=
"PauseForUpdate"
name=
"PauseForUpdate"
type=
"alertmodal"
>
type=
"alertmodal"
>
Version [VERSION] is required for login.
Version [VERSION] is required for login.
Release notes: [URL]
Click OK to download and install.
Click OK to download and install.
<tag>
confirm
</tag>
<tag>
confirm
</tag>
<usetemplate
<usetemplate
...
@@ -4068,6 +4071,7 @@ Click OK to download and install.
...
@@ -4068,6 +4071,7 @@ Click OK to download and install.
name=
"OptionalUpdateReady"
name=
"OptionalUpdateReady"
type=
"alertmodal"
>
type=
"alertmodal"
>
Version [VERSION] has been downloaded and is ready to install.
Version [VERSION] has been downloaded and is ready to install.
Release notes: [URL]
Click OK to install.
Click OK to install.
<tag>
confirm
</tag>
<tag>
confirm
</tag>
<usetemplate
<usetemplate
...
@@ -4080,6 +4084,7 @@ Click OK to install.
...
@@ -4080,6 +4084,7 @@ Click OK to install.
name=
"PromptOptionalUpdate"
name=
"PromptOptionalUpdate"
type=
"alertmodal"
>
type=
"alertmodal"
>
Version [VERSION] has been downloaded and is ready to install.
Version [VERSION] has been downloaded and is ready to install.
Release notes: [URL]
Proceed?
Proceed?
<tag>
confirm
</tag>
<tag>
confirm
</tag>
<usetemplate
<usetemplate
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment