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/llinventorybridge.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/llinventorybridge.cpp')
| -rwxr-xr-x | indra/newview/llinventorybridge.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 63e91f5d88..0671fc2719 100755 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -124,7 +124,7 @@ bool isAddAction(const std::string& action) bool isRemoveAction(const std::string& action) { - return ("take_off" == action || "detach" == action || "deactivate" == action); + return ("take_off" == action || "detach" == action); } bool isMarketplaceCopyAction(const std::string& action) @@ -5119,7 +5119,7 @@ void LLGestureBridge::performAction(LLInventoryModel* model, std::string action) gInventory.updateItem(item); gInventory.notifyObservers(); } - else if (isRemoveAction(action)) + else if ("deactivate" == action || isRemoveAction(action)) { LLGestureMgr::instance().deactivateGesture(mUUID); |