summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2015-04-09 14:28:58 -0700
committerMerov Linden <merov@lindenlab.com>2015-04-09 14:28:58 -0700
commit137185c2a9d2662a34813f83ec9971d00fa5af13 (patch)
treea30de1ab8584d5160f877912583f046f20ad6ba6 /indra
parent56b1f3d88158eb86edff4ef5392f41c84f57d3fc (diff)
DD-382 : Activation state should be unchanged when reassigning listing id
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llmarketplacefunctions.cpp4
1 files changed, 2 insertions, 2 deletions
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