summaryrefslogtreecommitdiff
path: root/indra/newview/llinventoryfunctions.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2015-02-10 22:40:28 -0800
committerMerov Linden <merov@lindenlab.com>2015-02-10 22:40:28 -0800
commit9ce64ec527f7b49b1641753ce6e67b8ed7f603c7 (patch)
tree883f57213bd6cf2bb0e4fd505146d9a3e4889ab8 /indra/newview/llinventoryfunctions.cpp
parent4e1054a71fa158d3e5c2eaaaaf374829c33f52cb (diff)
DD-324 : Alert the user when we split a stock folder
Diffstat (limited to 'indra/newview/llinventoryfunctions.cpp')
-rwxr-xr-xindra/newview/llinventoryfunctions.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 2140f3b352..02c4d76a13 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))
{