diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-09-26 21:25:11 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-09-26 21:25:11 +0100 |
| commit | 2783783575a9b712eb318b450dc5e6bb17d7f7c5 (patch) | |
| tree | fdec4e4cf274e2a916e22d73d11afbce5bb669c0 /indra/newview/lltoolpie.cpp | |
| parent | 6d256d679e9cea63753266420ed79efa8b70dee2 (diff) | |
| parent | 58aef8beaf79dc83546a7b080014ca5030733ac8 (diff) | |
Merge to 5.2.0
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
| -rw-r--r-- | indra/newview/lltoolpie.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 6a8843cb44..5082e16685 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -609,8 +609,8 @@ 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->flagHandleTouch()) - || (parent && parent->flagHandleTouch())) + else if ((!object || !object->isAttachment() || object->getClickAction() != CLICK_ACTION_DISABLED) + && ((object && object->flagHandleTouch()) || (parent && parent->flagHandleTouch()))) { show_highlight = true; gViewerWindow->setCursor(UI_CURSOR_HAND); |