diff options
| author | Callum Prentice <callum@lindenlab.com> | 2021-04-29 13:45:15 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2021-04-29 13:45:15 -0700 |
| commit | 99b99a1b4a21758ef888b251d8f8bbf565f8b42e (patch) | |
| tree | 5c91eaa4a6dffd724cdb0cb8f4de8c11f82335a5 /indra/newview/skins/default/xui/en/notifications.xml | |
| parent | 0df59ff9e6e50237d36a976731e81c6e37e73933 (diff) | |
| parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) | |
Clean up a merge conflict
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 9bb50de919..a1c73d12d0 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -4039,6 +4039,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" @@ -4056,6 +4058,8 @@ 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 @@ -4068,6 +4072,8 @@ 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 @@ -4080,6 +4086,8 @@ 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 |