diff options
| author | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-10-30 16:33:51 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-10-30 16:33:51 +0200 |
| commit | 4dfd54eef23af279f7f0f631a4b53e319670e504 (patch) | |
| tree | 7f4fe4b89d72cf1472633088d03732ad55fe592f /indra/newview/llappearancemgr.cpp | |
| parent | 9e6f193cd6b9b767679d810de8f2b45a7cd91540 (diff) | |
| parent | c0b95008811f1969f6d0863c5cdff4b800afba55 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
| -rwxr-xr-x | 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 53ae3c62ec..3d9b1a72a8 100755 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -3825,6 +3825,10 @@ void LLAppearanceMgr::removeItemsFromAvatar(const uuid_vec_t& ids_to_remove) { LL_DEBUGS("Avatar") << "ATT removing attachment " << item->getName() << " id " << item->getUUID() << LL_ENDL; } + if (item && item->getType() == LLAssetType::AT_BODYPART) + { + continue; + } removeCOFItemLinks(linked_item_id, cb); addDoomedTempAttachment(linked_item_id); } |