diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-12-19 14:00:33 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-12-19 14:01:33 +0200 |
| commit | ee2d618706a8803372b92dbe47a165c70be6cef9 (patch) | |
| tree | 7d871348213673527b28816256d43bdedbd9fc24 /indra | |
| parent | f927dfabfda91466813843f57a5bbe35a9af1243 (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.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 54ff7d295e..848b5eae1d 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -791,7 +791,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())) { |