diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-02-15 14:41:22 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-02-15 14:45:17 +0200 |
| commit | ce6dd53f9c364f46e30d0eedb1c6a701fbad8885 (patch) | |
| tree | dd55a059d1b7417cdd27744912da410836b17f9e | |
| parent | 921fe18f8bccdbc5df2123368fef2b8599c80a0e (diff) | |
SL-16564 'Click to' action 'None' doesn't work as intended #2
| -rw-r--r-- | indra/newview/lltoolpie.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 95552b6771..7e560f7972 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -392,8 +392,9 @@ BOOL LLToolPie::handleLeftClickPick() gFocusMgr.setKeyboardFocus(NULL); } - BOOL touchable = (object && object->flagHandleTouch()) - || (parent && parent->flagHandleTouch()); + bool touchable = object + && (object->getClickAction() != CLICK_ACTION_DISABLED) + && (object->flagHandleTouch() || (parent && parent->flagHandleTouch())); // Switch to grab tool if physical or triggerable if (object && |