From 9ce64ec527f7b49b1641753ce6e67b8ed7f603c7 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 10 Feb 2015 22:40:28 -0800
Subject: [PATCH] DD-324 : Alert the user when we split a stock folder
---
indra/newview/llinventoryfunctions.cpp | 5 +++++
indra/newview/skins/default/xui/en/notifications.xml | 12 ++++++++++++
2 files changed, 17 insertions(+)
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 2140f3b3521..02c4d76a133 100755
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -1719,6 +1719,11 @@ bool validate_marketplacelistings(LLInventoryCategory* cat, validation_callback_
{
if (fix_hierarchy && !has_bad_items)
{
+ // Alert the user when an existing stock folder has to be split
+ if ((folder_type == LLFolderType::FT_MARKETPLACE_STOCK) && ((count >= 2) || (cat_array->size() > 0)))
+ {
+ LLNotificationsUtil::add("AlertMerchantStockFolderSplit");
+ }
// If we have more than 1 type of items or we are at the listing level, wrap the items in subfolders
if ((count > 1) || (depth == 1))
{
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 570a69256d8..c4ae29b3635 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -485,6 +485,18 @@ This listing could not be updated.
yestext="OK"/>
</notification>
+ <notification
+ icon="alertmodal.tga"
+ name="AlertMerchantStockFolderSplit"
+ type="alertmodal">
+ We have separated stock items of different types into separate stock folders, so your folder is arranged in a way that we can list it.
+ <tag>confirm</tag>
+ <usetemplate
+ ignoretext="Alert when stock folder is being split before being listed"
+ name="okignore"
+ yestext="OK"/>
+ </notification>
+
<notification
icon="alertmodal.tga"
name="CompileQueueSaveText"
--
GitLab