diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-28 10:37:06 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-28 10:37:06 +0100 |
| commit | b459f95551c9dd03190d02cb9abcf65cd0749cf3 (patch) | |
| tree | 310cd028cea3fe636ce355d044564f009f40c9ef /indra/newview/llappearancemgr.cpp | |
| parent | 6c348f9133e0a0dee000894c40d17ed67bac68a5 (diff) | |
| parent | 76da1229ec26b582e054e8a1588ea78943c92d70 (diff) | |
merge from viewer-release
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index dcbbf9bb2c..63315ce2ae 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -983,6 +983,10 @@ bool LLAppearanceMgr::wearItemOnAvatar(const LLUUID& item_id_to_wear, bool do_up LLNotificationsUtil::add("CannotWearTrash"); return false; } + else if (gInventory.isObjectDescendentOf(item_to_wear->getUUID(), LLAppearanceMgr::instance().getCOF())) // EXT-84911 + { + return false; + } switch (item_to_wear->getType()) { |