diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-07-30 19:23:56 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-07-30 19:23:56 +0300 |
| commit | 287e1bafb286820e3d7d89c59082c72f622a53be (patch) | |
| tree | 4e6a126763e80427e08550fecf2a75d324ba0e1d /indra/newview/llappearancemgr.cpp | |
| parent | b30dd09e478e93ab9bbc6e6a88f8796e19fc4bdb (diff) | |
MAINT-5439 FIXED Gesture will not deactivate by using the deactivate button in inventory drop down menu
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
| -rwxr-xr-x | indra/newview/llappearancemgr.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index a0c3868dc6..142a3250c8 100755 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -3821,17 +3821,9 @@ void LLAppearanceMgr::removeItemsFromAvatar(const uuid_vec_t& ids_to_remove) const LLUUID& id_to_remove = *it; const LLUUID& linked_item_id = gInventory.getLinkedItemID(id_to_remove); LLViewerInventoryItem *item = gInventory.getItem(linked_item_id); - if (item) + if (item && item->getType() == LLAssetType::AT_OBJECT) { - if (item->getType() == LLAssetType::AT_OBJECT) - { - LL_DEBUGS("Avatar") << "ATT removing attachment " << item->getName() << " id " << item->getUUID() << LL_ENDL; - } - if (item->getType() == LLAssetType::AT_GESTURE && LLGestureMgr::instance().isGestureActive(item->getLinkedUUID())) - { - // deactivate gesture before removing link - LLGestureMgr::instance().deactivateGesture(item->getLinkedUUID()); - } + LL_DEBUGS("Avatar") << "ATT removing attachment " << item->getName() << " id " << item->getUUID() << LL_ENDL; } removeCOFItemLinks(linked_item_id, cb); addDoomedTempAttachment(linked_item_id); |