From 0118a862fb63971b8b718ebecf72292b8318e464 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 1 Apr 2015 21:54:07 -0700 Subject: DD-291 : Fix code path on category update in the SLM update case --- indra/newview/llinventorymodel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index b44bd38841..9f621b1e88 100755 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -3061,15 +3061,15 @@ void LLInventoryModel::processBulkUpdateInventory(LLMessageSystem* msg, void**) << tfolder->getUUID() << ") in " << tfolder->getParentUUID() << LL_ENDL; - // If the parent folder is a listing folder, we also need to update the SLM data + // If the parent folder is a listing folder, all we need to do is update the SLM data if (LLMarketplaceData::instance().isListed(tfolder->getParentUUID())) { // Trigger an SLM listing update S32 listing_id = LLMarketplaceData::instance().getListingID(tfolder->getParentUUID()); LLMarketplaceData::instance().getListing(listing_id); + // In that case, there is no item to update so no callback -> we skip the rest of the update } - - if(tfolder->getUUID().notNull()) + else if(tfolder->getUUID().notNull()) { folders.push_back(tfolder); LLViewerInventoryCategory* folderp = gInventory.getCategory(tfolder->getUUID()); -- cgit v1.2.3