From cb8b5f6ba61b6fd11aae92ca9cb5fdee5032a877 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 17 May 2021 17:14:52 +0300
Subject: SL-15223 FIXED "Reason: 'Not Found'" error message floater is shown
when delete the unlisted listing folder
---
indra/newview/llinventoryfunctions.cpp | 6 +++---
indra/newview/llinventoryfunctions.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 7a0ea8b668..b27c730630 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -254,7 +254,7 @@ void update_marketplace_folder_hierarchy(const LLUUID cat_id)
return;
}
-void update_marketplace_category(const LLUUID& cur_uuid, bool perform_consistency_enforcement)
+void update_marketplace_category(const LLUUID& cur_uuid, bool perform_consistency_enforcement, bool skip_clear_listing)
{
// When changing the marketplace status of an item, we usually have to change the status of all
// folders in the same listing. This is because the display of each folder is affected by the
@@ -326,7 +326,7 @@ void update_marketplace_category(const LLUUID& cur_uuid, bool perform_consistenc
else
{
// If the folder is outside the marketplace listings root, clear its SLM data if needs be
- if (perform_consistency_enforcement && LLMarketplaceData::instance().isListed(cur_uuid))
+ if (perform_consistency_enforcement && !skip_clear_listing && LLMarketplaceData::instance().isListed(cur_uuid))
{
LL_INFOS("SLM") << "Disassociate as the listing folder is not under the marketplace folder anymore!!" << LL_ENDL;
LLMarketplaceData::instance().clearListing(cur_uuid);
@@ -1837,7 +1837,7 @@ bool validate_marketplacelistings(LLInventoryCategory* cat, validation_callback_
result &= validate_marketplacelistings(category, cb, fix_hierarchy, depth + 1);
}
- update_marketplace_category(cat->getUUID());
+ update_marketplace_category(cat->getUUID(), true, true);
gInventory.notifyObservers();
return result && !has_bad_items;
}
diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h
index 04eb962372..82bca1f84d 100644
--- a/indra/newview/llinventoryfunctions.h
+++ b/indra/newview/llinventoryfunctions.h
@@ -68,7 +68,7 @@ void show_item_original(const LLUUID& item_uuid);
void reset_inventory_filter();
// Nudge the listing categories in the inventory to signal that their marketplace status changed
-void update_marketplace_category(const LLUUID& cat_id, bool perform_consistency_enforcement = true);
+void update_marketplace_category(const LLUUID& cat_id, bool perform_consistency_enforcement = true, bool skip_clear_listing = false);
// Nudge all listing categories to signal that their marketplace status changed
void update_all_marketplace_count();
--
cgit v1.2.3