summaryrefslogtreecommitdiff
path: root/indra/newview/llmarketplacefunctions.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-05-29 16:56:15 -0700
committerMerov Linden <merov@lindenlab.com>2014-05-29 16:56:15 -0700
commitb9407199462c0b56a7d49c2e19657e87ec149d8c (patch)
treeeda4a3328111f7df3c6ae9163789f32060287b37 /indra/newview/llmarketplacefunctions.cpp
parent22ee6abe0b4cd354ccbcb9055678356e91d009ff (diff)
DD-84 : WIP : Get DAMA to display for drag and drop. Note that, because of current SLM issues, it works on version folders, active or not.
Diffstat (limited to 'indra/newview/llmarketplacefunctions.cpp')
-rwxr-xr-xindra/newview/llmarketplacefunctions.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp
index 957e96e866..75853b2cc0 100755
--- a/indra/newview/llmarketplacefunctions.cpp
+++ b/indra/newview/llmarketplacefunctions.cpp
@@ -1426,6 +1426,17 @@ bool LLMarketplaceData::isVersionFolder(const LLUUID& folder_id)
return false;
}
+bool LLMarketplaceData::isInActiveFolder(const LLUUID& obj_id)
+{
+ S32 depth = depth_nesting_in_marketplace(obj_id);
+ LLUUID listing_uuid = nested_parent_id(obj_id, depth);
+ // *TODO: use true activation status once SLM is in decent shape again
+ //bool active = getActivationState(listing_uuid); Hack waiting for SLM to allow activation again...
+ bool active = true;
+ LLUUID version_uuid = getVersionFolder(listing_uuid);
+ return (active && gInventory.isObjectDescendentOf(obj_id, version_uuid));
+}
+
// Private Modifiers
bool LLMarketplaceData::setListingID(const LLUUID& folder_id, S32 listing_id)
{