summaryrefslogtreecommitdiff
path: root/indra/newview/llmarketplacefunctions.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-08-23 17:31:33 -0700
committerMerov Linden <merov@lindenlab.com>2014-08-23 17:31:33 -0700
commitc77575df2f91452ad1a527f2f46ba1191459b259 (patch)
treefa817207ce76d8a11a01bf55fccd8738b8b1b0f0 /indra/newview/llmarketplacefunctions.cpp
parentc4ad85ecb9c85cdbedec6c297ae3ab2bc5eb554b (diff)
DD-122 : Fixed. Unlist if listing doesn't validate after move
Diffstat (limited to 'indra/newview/llmarketplacefunctions.cpp')
-rwxr-xr-xindra/newview/llmarketplacefunctions.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp
index a23295ec20..669c49ea4f 100755
--- a/indra/newview/llmarketplacefunctions.cpp
+++ b/indra/newview/llmarketplacefunctions.cpp
@@ -1459,6 +1459,13 @@ bool LLMarketplaceData::isInActiveFolder(const LLUUID& obj_id)
return (active && ((obj_id == version_uuid) || gInventory.isObjectDescendentOf(obj_id, version_uuid)));
}
+LLUUID LLMarketplaceData::getActiveFolder(const LLUUID& obj_id)
+{
+ S32 depth = depth_nesting_in_marketplace(obj_id);
+ LLUUID listing_uuid = nested_parent_id(obj_id, depth);
+ return (getActivationState(listing_uuid) ? getVersionFolder(listing_uuid) : LLUUID::null);
+}
+
// Private Modifiers
bool LLMarketplaceData::setListingID(const LLUUID& folder_id, S32 listing_id)
{