From 137185c2a9d2662a34813f83ec9971d00fa5af13 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 9 Apr 2015 14:28:58 -0700 Subject: DD-382 : Activation state should be unchanged when reassigning listing id --- indra/newview/llmarketplacefunctions.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp index d10a1e8cd9..5d8bab5833 100755 --- a/indra/newview/llmarketplacefunctions.cpp +++ b/indra/newview/llmarketplacefunctions.cpp @@ -1582,11 +1582,11 @@ 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 = false; // a listed listing cannot be reassociated + 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 if (version_id.notNull()) { - count = compute_stock_count(version_id, true); + count = compute_stock_count(version_id, true); // Use the stock count of the new listing } // Post the listing update request to SLM -- cgit v1.2.3