From b2c7fb9aeead8d1c549c0bb96a9a986686a1211d Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 23 Oct 2014 19:45:48 -0700
Subject: DD-224, DD-246 : Clean up code when receiving delete notification.
 Display DAMA alert when associating listing

---
 indra/newview/skins/default/xui/en/notifications.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'indra/newview/skins/default')

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
@@ -382,6 +382,18 @@ Initialization with the Marketplace failed because of a system or network error.
         yestext="OK"/>
     </notification>
 
+    <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"
-- 
cgit v1.2.3