diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-28 10:32:28 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-28 10:32:28 +0100 |
| commit | 76da1229ec26b582e054e8a1588ea78943c92d70 (patch) | |
| tree | 54233cf60fad3167c4502c04a72fced9e590db86 /indra/newview/llinventoryfunctions.cpp | |
| parent | a3328658725dd12efbb1a9107e4c6f0612772c12 (diff) | |
| parent | 6110cb6a36cb9cef39af0951ec47458696ac1da6 (diff) | |
merge from PE's viewer-release
Diffstat (limited to 'indra/newview/llinventoryfunctions.cpp')
| -rw-r--r-- | indra/newview/llinventoryfunctions.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index f20acbd016..3d350606c6 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; + } switch(item->getType()) { |