From 855696c36980ded4aa93c315e1cd3d7e2b278446 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Sat, 24 Jan 2015 17:30:05 -0800
Subject: [PATCH] DD-303 : Suppress message on activation when associating
since we auto activate or have another message
---
indra/newview/llmarketplacefunctions.cpp | 2 --
indra/newview/skins/default/xui/en/notifications.xml | 12 ------------
2 files changed, 14 deletions(-)
diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp
index 7d02b4e6274..d292dd25e79 100755
--- a/indra/newview/llmarketplacefunctions.cpp
+++ b/indra/newview/llmarketplacefunctions.cpp
@@ -571,8 +571,6 @@ class LLSLMAssociateListingsResponder : public LLHTTPClient::Responder
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 75be55061f4..4173c8b0d7b 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -434,18 +434,6 @@ 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"
--
GitLab