From 50805277b30fcbb9fcec8ed078f472d1e3ee3802 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Mon, 13 Apr 2015 15:58:56 -0700 Subject: DD-382 : Use default values on association when version folder is not unique --- indra/newview/llmarketplacefunctions.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp index 88a05c1e7f..bab655199f 100755 --- a/indra/newview/llmarketplacefunctions.cpp +++ b/indra/newview/llmarketplacefunctions.cpp @@ -1630,11 +1630,12 @@ bool LLMarketplaceData::associateListing(const LLUUID& folder_id, const LLUUID& associateSLMListing(folder_id, listing_id, version_id, source_folder_id); // Update the other values as required - bool is_listed = getActivationState(source_folder_id); // Use the activation state of the source listing - S32 count = -1; // count on hand must be set according to the new active version folder if any + bool is_listed = false; + S32 count = -1; if (version_id.notNull()) { - count = compute_stock_count(version_id, true); // Use the stock count of the new listing + count = compute_stock_count(version_id, true); // Use the stock count of the new listing + is_listed = getActivationState(source_folder_id); // Use the activation state of the source listing } // Validate the count on hand if (count == COMPUTE_STOCK_NOT_EVALUATED) -- cgit v1.2.3