3 files changed, 62 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index f3429607e9..fb5d145637 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -1098,6 +1098,13 @@ BOOL LLInvFVBridge::canListOnMarketplaceNow() const
 		return FALSE;
 	}
 
+	// Loop through all items worn by avatar and check to see if they are descendants
+	// of the item we are trying to list on the marketplace
+	if (get_is_parent_to_worn_item(mUUID))
+	{
+		return FALSE;
+	}
+
 	return TRUE;
 }
 
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 8632e40c54..0af013fde5 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -211,6 +211,58 @@ void rename_category(LLInventoryModel* model, const LLUUID& cat_id, const std::s
 	model->notifyObservers();
 }
 
+class LLInventoryCollectAllItems : public LLInventoryCollectFunctor
+{
+public:
+	virtual bool operator()(LLInventoryCategory* cat, LLInventoryItem* item)
+	{
+		return true;
+	}
+};
+
+BOOL get_is_parent_to_worn_item(const LLUUID& id)
+{
+	const LLViewerInventoryCategory* cat = gInventory.getCategory(id);
+	if (!cat)
+	{
+		return FALSE;
+	}
+
+	LLInventoryModel::cat_array_t cats;
+	LLInventoryModel::item_array_t items;
+	LLInventoryCollectAllItems collect_all;
+	gInventory.collectDescendentsIf(LLAppearanceMgr::instance().getCOF(), cats, items, LLInventoryModel::EXCLUDE_TRASH, collect_all);
+
+	for (LLInventoryModel::item_array_t::const_iterator it = items.begin(); it != items.end(); ++it)
+	{
+		const LLViewerInventoryItem * const item = *it;
+
+		llassert(item->getIsLinkType());
+
+		LLUUID linked_id = item->getLinkedUUID();
+		const LLViewerInventoryItem * const linked_item = gInventory.getItem(linked_id);
+
+		if (linked_item)
+		{
+			LLUUID parent_id = linked_item->getParentUUID();
+
+			while (!parent_id.isNull())
+			{
+				LLInventoryCategory * parent_cat = gInventory.getCategory(parent_id);
+
+				if (cat == parent_cat)
+				{
+					return TRUE;
+				}
+
+				parent_id = parent_cat->getParentUUID();
+			}
+		}
+	}
+
+	return FALSE;
+}
+
 BOOL get_is_item_worn(const LLUUID& id)
 {
 	const LLViewerInventoryItem* item = gInventory.getItem(id);
diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h
index 3e80fe322c..7b452537f8 100644
--- a/indra/newview/llinventoryfunctions.h
+++ b/indra/newview/llinventoryfunctions.h
@@ -37,6 +37,9 @@
  **                    MISCELLANEOUS GLOBAL FUNCTIONS
  **/
 
+// Is this a parent folder to a worn item
+BOOL get_is_parent_to_worn_item(const LLUUID& id);
+
 // Is this item or its baseitem is worn, attached, etc...
 BOOL get_is_item_worn(const LLUUID& id);