summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/notifications.xml
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-08-12 14:53:25 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-08-12 14:53:25 -0700
commit10ec0049125317d5c0bdd1bf89b96a54a9b2d873 (patch)
tree97efa1a6731aef7e703e1a6ca2eaa4a01dbb6fa8 /indra/newview/skins/default/xui/en/notifications.xml
parente69efc8369a65008d41155717761fbaec0e309c5 (diff)
parent25f1653ca0a25c73b3c0649ee5bb7c65e5378eac (diff)
merge from viewer-experience
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml18
1 files changed, 16 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5c600265c2..ca77b4358b 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -199,8 +199,8 @@ Save changes to current clothing/body part?
yestext="Save"/>
</notification>
- <notification
- icon="alertmodal.tga"
+ <notification
+ icon="alertmodal.tga"
name="ConfirmNoCopyToOutbox"
type="alertmodal">
You don't have permission to copy this item to the Marketplace Outbox. Are you sure you want to move the following item?
@@ -6825,6 +6825,20 @@ See the log file for details.
</notification>
<notification
+ name="MeshUploadPermError"
+ icon="alert.tga"
+ type="alert">
+ Error while requesting mesh upload permissons.
+ </notification>
+
+ <notification
+ name="RegionCapabilityRequestError"
+ icon="alert.tga"
+ type="alert">
+ Could not get region capability &apos;[CAPABILITY]&apos;.
+ </notification>
+
+ <notification
icon="notifytip.tga"
name="ShareItemsConfirmation"
type="alertmodal">