merge from viewer-release

1 files changed, 12 insertions, 0 deletions

diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 2517db2678..86af76e0a4 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -250,6 +250,18 @@ BOOL get_can_item_be_worn(const LLUUID& id)
 	const LLViewerInventoryItem* item = gInventory.getItem(id);
 	if (!item)
 		return FALSE;
+
+	if (LLAppearanceMgr::isLinkInCOF(item->getLinkedUUID()))
+	{
+		// an item having links in COF (i.e. a worn item)
+		return FALSE;
+	}
+
+	if (gInventory.isObjectDescendentOf(id, LLAppearanceMgr::instance().getCOF()))
+	{
+		// a non-link object in COF (should not normally happen)
+		return FALSE;
+	}
 	
 	const LLUUID trash_id = gInventory.findCategoryUUIDForType(
 			LLFolderType::FT_TRASH);