diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2018-07-30 12:18:28 +0000 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2018-07-30 12:18:28 +0000 |
| commit | 0d14f3576d7a6b330043ea590c5e991b9252cc0a (patch) | |
| tree | f746f26450923fbc20d7a617e9774f792d308874 /indra/newview | |
| parent | e282be5549448bca2bed19e1db4eb7c770e6f6b2 (diff) | |
| parent | f7932f32a1e21b665fb4a81fbe78790d3e857358 (diff) | |
Merged in MAINT-8911
Diffstat (limited to 'indra/newview')
| -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); |