livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-5439 FIXED Gesture will not deactivate by using the deactivate button in inventory drop down menu

meow-7.2.2
andreykproductengine 2015-07-27 18:46:29 +03:00
parent 1d3c59f29c
commit 33dfd860ec
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llappearancemgr.cpp
View File

@ -3821,9 +3821,17 @@ 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 && item->getType() == LLAssetType::AT_OBJECT)
if (item)
{
LL_DEBUGS("Avatar") << "ATT removing attachment " << item->getName() << " id " << item->getUUID() << LL_ENDL;
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());
}
}
removeCOFItemLinks(linked_item_id, cb);
addDoomedTempAttachment(linked_item_id);