From ce6dd53f9c364f46e30d0eedb1c6a701fbad8885 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 15 Feb 2022 14:41:22 +0200 Subject: SL-16564 'Click to' action 'None' doesn't work as intended #2 --- indra/newview/lltoolpie.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/newview') 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 && -- cgit v1.2.3