Backed out changeset a62bf7c0af21

Backing out this merge that I pushed (prematurely) to the wrong place.

1 files changed, 1 insertions, 17 deletions

diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index f3d9639dee..e814cf012e 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -215,13 +215,7 @@ BOOL get_is_item_worn(const LLUUID& id)
 	const LLViewerInventoryItem* item = gInventory.getItem(id);
 	if (!item)
 		return FALSE;
-
-	// Consider the item as worn if it has links in COF.
-	if (LLAppearanceMgr::instance().isLinkInCOF(id))
-	{
-		return TRUE;
-	}
-
+	
 	switch(item->getType())
 	{
 		case LLAssetType::AT_OBJECT:
@@ -263,16 +257,6 @@ BOOL get_can_item_be_worn(const LLUUID& id)
 		return FALSE;
 	}
 	
-	const LLUUID trash_id = gInventory.findCategoryUUIDForType(
-			LLFolderType::FT_TRASH);
-
-	// item can't be worn if base obj in trash, see EXT-7015
-	if (gInventory.isObjectDescendentOf(item->getLinkedUUID(),
-			trash_id))
-	{
-		return false;
-	}
-
 	switch(item->getType())
 	{
 		case LLAssetType::AT_OBJECT: