diff options
author | Merov Linden <merov@lindenlab.com> | 2015-04-01 21:54:07 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2015-04-01 21:54:07 -0700 |
commit | 0118a862fb63971b8b718ebecf72292b8318e464 (patch) | |
tree | 56efd203327a401370f4a1f319c5154493f457ec | |
parent | 84b3899af26bdc8995641e3b89882fab4a79add1 (diff) |
DD-291 : Fix code path on category update in the SLM update case
-rwxr-xr-x | indra/newview/llinventorymodel.cpp | 6 |
1 files 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()); |