From 921fe18f8bccdbc5df2123368fef2b8599c80a0e Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Sun, 19 Dec 2021 14:00:33 +0200 Subject: SL-16564 'Click to' action 'None' doesn't work as intended There shouldn't be any differences for 'None' between normal objects and attachments --- indra/newview/lltoolpie.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 6efed98fff..95552b6771 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -798,7 +798,7 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask) gViewerWindow->setCursor(UI_CURSOR_TOOLGRAB); LL_DEBUGS("UserInput") << "hover handled by LLToolPie (inactive)" << LL_ENDL; } - else if ((!object || !object->isAttachment() || object->getClickAction() != CLICK_ACTION_DISABLED) + else if ((!object || object->getClickAction() != CLICK_ACTION_DISABLED) && ((object && object->flagHandleTouch()) || (parent && parent->flagHandleTouch())) && (!object || !object->isAvatar())) { -- cgit v1.2.3