DD-276, DD-280 : Serialize update count on SLM by preventing sending update while previous transaction not completed

1 files changed, 3 insertions, 2 deletions

diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index ac1efa5471..461631288c 100755
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -178,7 +178,8 @@ void update_marketplace_category(const LLUUID& cur_uuid, bool perform_consistenc
         }
     
         // Check if the count on hand needs to be updated on SLM
-        if (compute_stock_count(listing_uuid) != LLMarketplaceData::instance().getCountOnHand(listing_uuid))
+        if (!LLMarketplaceData::instance().isUpdating(listing_uuid) &&
+            (compute_stock_count(listing_uuid) != LLMarketplaceData::instance().getCountOnHand(listing_uuid)))
         {
             LLMarketplaceData::instance().updateCountOnHand(listing_uuid);
         }
@@ -195,7 +196,7 @@ void update_marketplace_category(const LLUUID& cur_uuid, bool perform_consistenc
     }
     else
     {
-        // If the folder is outside the marletplace listings root, clear its SLM data if needs be
+        // 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))
         {
             LL_INFOS("SLM") << "Disassociate as the listing folder is not under the marketplace folder anymore!!" << LL_ENDL;