summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/notifications.xml
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2013-06-19 09:58:43 -0700
committerdolphin <dolphin@lindenlab.com>2013-06-19 09:58:43 -0700
commitea40b3a37b0f9b7e09e999a2c6529905e251ecad (patch)
tree9cfb5603040efc7738bca633b902c190db28b0bf /indra/newview/skins/default/xui/en/notifications.xml
parentebc604fa8d12fb08fda1ac55aae817ad0135bb6b (diff)
parent2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff)
Merge with viewer 3.6.0
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
-rwxr-xr-xindra/newview/skins/default/xui/en/notifications.xml10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 970a11c6c4..9e582cf0de 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3454,7 +3454,7 @@ or you can install it now.
name="DownloadBackgroundTip"
type="notify">
We have downloaded an update to your [APP_NAME] installation.
-Version [VERSION] [[INFO_URL] Information about this update]
+Version [VERSION] [[RELEASE_NOTES_FULL_URL] Information about this update]
<tag>confirm</tag>
<usetemplate
name="okcancelbuttons"
@@ -3467,7 +3467,7 @@ Version [VERSION] [[INFO_URL] Information about this update]
name="DownloadBackgroundDialog"
type="alertmodal">
We have downloaded an update to your [APP_NAME] installation.
-Version [VERSION] [[INFO_URL] Information about this update]
+Version [VERSION] [[RELEASE_NOTES_FULL_URL] Information about this update]
<tag>confirm</tag>
<usetemplate
name="okcancelbuttons"
@@ -6923,9 +6923,9 @@ Do not allow access if you do not fully understand why it wants access to your a
[FOOTERTEXT]
</footer>
</notification>
-
- <notification
- icon="notify.tga"
+
+ <notification
+ icon="notify.tga"
name="UnknownScriptQuestion"
persist="false"
type="notify">