summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/notifications.xml
diff options
context:
space:
mode:
authorPalmer <palmer@lindenlab.com>2009-12-08 16:06:18 -0800
committerPalmer <palmer@lindenlab.com>2009-12-08 16:06:18 -0800
commit7a7eced4a619d98d808abba3f0bf951bcf4cd95a (patch)
tree574d0aee2a6cd418af7f84aacfb134fb813b9ec0 /indra/newview/skins/default/xui/en/notifications.xml
parent74f2cb2a70ddad7fe8819fd6855831e0615dc8d5 (diff)
Fix of last merge borkasaur. Left off a comma on defining the mesh array. Also switched our mesh icon code to sync with viewer 2 and cleared out extra notification
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml21
1 files changed, 5 insertions, 16 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b8b9acbc10..4fbaf06553 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5803,22 +5803,11 @@ Your voice has been muted by moderator.
name="okbutton"
yestext="OK"/>
</notification>
-
- <notification
- icon="alertmodal.tga"
- name="ConfirmClearTeleportHistory"
- type="alertmodal">
-Are you sure you want to delete your teleport history?
- <usetemplate
- name="okcancelbuttons"
- notext="Cancel"
- yestext="OK"/>
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="UploadCostConfirmation"
- type="alertmodal">
+
+ <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"