summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-10-23 19:45:48 -0700
committerMerov Linden <merov@lindenlab.com>2014-10-23 19:45:48 -0700
commitb2c7fb9aeead8d1c549c0bb96a9a986686a1211d (patch)
treef172ff41ccf437fbc988a4f900ee8cc9710cfd18 /indra/newview/skins
parentf99dbd9be0f631ee9135ac89d8322c359711d626 (diff)
DD-224, DD-246 : Clean up code when receiving delete notification. Display DAMA alert when associating listing
Diffstat (limited to 'indra/newview/skins')
-rwxr-xr-xindra/newview/skins/default/xui/en/notifications.xml12
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 990ba2dea3..70f3f86102 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -384,6 +384,18 @@ Initialization with the Marketplace failed because of a system or network error.
<notification
icon="alertmodal.tga"
+ name="AlertMerchantAssociateNeedsVersion"
+ type="alertmodal">
+ Before you can activate this listing or edit it on the Marketplace web site, you will need to activate a version folder.
+ <tag>confirm</tag>
+ <usetemplate
+ ignoretext="Alert about version folder requirements when I associate a listing with an existing listing id"
+ name="okignore"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
name="AlertMerchantListingNotUpdated"
type="alertmodal">
This listing could not be updated.