summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-12-19 14:00:33 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2022-02-15 14:45:13 +0200
commit921fe18f8bccdbc5df2123368fef2b8599c80a0e (patch)
tree4773bb1256b6059100e8d7863f5afe7c5d055804 /indra
parent2dd192ce362331287f46bd0c6c02b87672c8143e (diff)
SL-16564 'Click to' action 'None' doesn't work as intended
There shouldn't be any differences for 'None' between normal objects and attachments
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/lltoolpie.cpp2
1 files changed, 1 insertions, 1 deletions
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()))
{