diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-07-27 18:00:37 +0300 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-07-27 18:00:37 +0300 |
| commit | 872c7fd9573b9d694b32431d9827dd814dbb8fee (patch) | |
| tree | f0a00cf68dee36b05dbfa48b4fc31e27d567fcbd /indra/newview/llinventoryfunctions.cpp | |
| parent | 17fdce0ef24b863c6922f18d6e29d2b55d43b1b5 (diff) | |
Performed necessary refactoring after merge rev. 14093:babb41195f70
--HG--
branch : product-engine
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: |