diff options
author | Dave Parks <davep@lindenlab.com> | 2010-04-07 13:50:47 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2010-04-07 13:50:47 -0500 |
commit | 666c7c429b7f38f7c93bf6c287157c2e3ab9ccd7 (patch) | |
tree | 8f3e9399dbc5cab6c28c5992b579368bb0aa8949 /indra/newview/skins/default/xui/en/notifications.xml | |
parent | 8ac6310020bd2d524c97c729c29a0afe4a529ecf (diff) | |
parent | b6d3d2281b855448bbeec33b2d229222d75cd6b1 (diff) |
merge
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index e8ba8c683d..a35e1a6eb4 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5892,7 +5892,7 @@ Attachment has been saved. Unable to find the help topic for this element. </notification> - <notification + <notification icon="alertmodal.tga" name="ObjectMediaFailure" type="alertmodal"> @@ -5922,6 +5922,17 @@ Your voice has been muted by moderator. name="okbutton" yestext="OK"/> </notification> + + <notification + icon="alertmodal.tga" + name="UploadCostConfirmation" + type="alertmodal"> +This upload will cost L$[PRICE], do you wish to continue with the upload? + <usetemplate + name="okcancelbuttons" + notext="Cancel" + yestext="Upload"/> + </notification> <notification icon="alertmodal.tga" @@ -5942,6 +5953,12 @@ Selected button can not be shown right now. The button will be shown when there is enough space for it. </notification> + <notification + name="MeshUploadError" + icon="alert.tga" + type="alert"> + [LABEL] failed to upload: [MESSAGE] [IDENTIFIER] [INVALIDITY_IDENTIFIER] + </notification> <global name="UnsupportedCPU"> - Your CPU speed does not meet the minimum requirements. |