DD-303 : Suppress message on activation when associating since we auto activate or have another message

2 files changed, 0 insertions, 14 deletions

diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp
index 7d02b4e627..d292dd25e7 100755
--- a/indra/newview/llmarketplacefunctions.cpp
+++ b/indra/newview/llmarketplacefunctions.cpp
@@ -571,8 +571,6 @@ public:
             update_marketplace_category(folder_id, false);
             gInventory.notifyObservers();
 
-            // Alert with DAMA informing the user that a version folder must be designated
-            LLNotificationsUtil::add("AlertMerchantAssociateNeedsVersion");
             it++;
         }
         
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 75be55061f..4173c8b0d7 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -436,18 +436,6 @@ 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.