diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-28 10:35:59 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-28 10:35:59 +0100 |
| commit | b6804a855bc54b060f5e27cfdce7a8277c590ee9 (patch) | |
| tree | e5706bacda7b26452f2f06f4f187ab4595982a52 /indra/newview/llinventoryfunctions.cpp | |
| parent | 28bd15d47d015798417f885926f692e8113fe054 (diff) | |
| parent | 4c693bfe89e930ce958a65b4521f36d5079dd907 (diff) | |
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/llinventoryfunctions.cpp')
| -rw-r--r-- | indra/newview/llinventoryfunctions.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index f20acbd016..2517db2678 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -251,6 +251,16 @@ BOOL get_can_item_be_worn(const LLUUID& id) if (!item) 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: |