From 7eca3a98b8b770e35a96af3ae51edf73533552fa Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 22 Aug 2015 12:44:01 +0200 Subject: [PATCH] Backout b098e94a3b4c since isRemoveAction() now doesn't check for "deactivate" anymore --- indra/newview/llinventoryfunctions.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index be908a6f01..24b054fe17 100755 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -2737,10 +2737,7 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root { wear_multiple(ids, false); } - // FIRE-16511 / BUG-9739: Unable to deactivate gestures from inventory - //else if (isRemoveAction(action)) - else if (isRemoveAction(action) && action != "deactivate") - // + else if (isRemoveAction(action)) { LLAppearanceMgr::instance().removeItemsFromAvatar(ids); }