summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2015-05-01 14:28:58 -0700
committerMerov Linden <merov@lindenlab.com>2015-05-01 14:28:58 -0700
commit1717a7edbd8be48155685afb2ac1601cc971dee6 (patch)
tree39df076b9d2dfd55b746f06296da681bb8015a31 /indra/newview
parent026db0511f4706ffa7c817ca98ca8a2a68ab5098 (diff)
DD-379 : React on update for both listing and version folders
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llinventorymodel.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 5139564a6d..0bad4702e0 100755
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -3066,11 +3066,13 @@ void LLInventoryModel::processBulkUpdateInventory(LLMessageSystem* msg, void**)
<< tfolder->getUUID() << ") in " << tfolder->getParentUUID()
<< LL_ENDL;
- // If the parent folder is a listing folder, all we need to do is update the SLM data
- if (depth_nesting_in_marketplace(tfolder->getParentUUID()) == 1)
+ // If the folder is a listing or a version folder, all we need to do is update the SLM data
+ int depth_folder = depth_nesting_in_marketplace(tfolder->getUUID());
+ if ((depth_folder == 1) || (depth_folder == 2))
{
// Trigger an SLM listing update
- S32 listing_id = LLMarketplaceData::instance().getListingID(tfolder->getParentUUID());
+ LLUUID listing_uuid = (depth_folder == 1 ? tfolder->getUUID() : tfolder->getParentUUID());
+ S32 listing_id = LLMarketplaceData::instance().getListingID(listing_uuid);
LLMarketplaceData::instance().getListing(listing_id);
// In that case, there is no item to update so no callback -> we skip the rest of the update
}