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 | 6c348f9133e0a0dee000894c40d17ed67bac68a5 (patch) | |
| tree | e5706bacda7b26452f2f06f4f187ab4595982a52 /indra/newview/llinventoryfunctions.cpp | |
| parent | c96caed698afb38c50db229fff35fa8b91e40f83 (diff) | |
| parent | 0156e91c50ec77c92a6971c452a4cfe7a5f2bcab (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: |