diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-08-18 11:29:17 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-08-18 11:29:17 -0600 |
| commit | 9f0da75332fcbb1bc97812baf67900702d6ced85 (patch) | |
| tree | 123671904c3b349b3f557483a4a98781ce03943a /indra/newview/skins/default/xui | |
| parent | 2c964e82f5ac42fbb86f551783dfb04fcdfaf460 (diff) | |
| parent | e8b31d03b4f6f0ffb981b4ea150743daf7b4a958 (diff) | |
Merge branch 'master' 6.4.8 into DRTVWR-497
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 05fd1947fe..32ae56e3af 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -4016,8 +4016,6 @@ 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" @@ -4035,7 +4033,6 @@ 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 @@ -4048,7 +4045,6 @@ 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 @@ -4061,7 +4057,6 @@ 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 @@ -7209,12 +7204,14 @@ You can only claim public land in the Region you're in. </notification> <notification - icon="notify.tga" + icon="alertmodal.tga" name="RegionTPAccessBlocked" - persist="false" - type="notify"> + type="alertmodal"> <tag>fail</tag> The region you're trying to visit contains content exceeding your current preferences. You can change your preferences using Me > Preferences > General. + <usetemplate + name="okbutton" + yestext="OK"/> </notification> <notification |