diff options
| author | Dave Parks <davep@lindenlab.com> | 2023-02-07 11:41:13 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2023-02-07 11:41:13 -0600 |
| commit | 8926242d096ac9975efab4426a23161f8717edcb (patch) | |
| tree | 866128c96472b1816253486a02a031c2f2bc3ad0 /indra | |
| parent | b52699091da791a1349daf66d405f27ca2568ea9 (diff) | |
| parent | fb402f80a8f634ab4e2bcfe337147a6523fc2771 (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/lltoolpie.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index a0c7afa1bd..dcc528e887 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -745,18 +745,8 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask) parent = object->getRootEdit(); } - // Show screen-space highlight glow effect - bool show_highlight = false; - - if (handleMediaHover(mHoverPick)) - { - // *NOTE: If you think the hover glow conflicts with the media outline, you - // could disable it here. - show_highlight = true; - // cursor set by media object - LL_DEBUGS("UserInput") << "hover handled by LLToolPie (inactive)" << LL_ENDL; - } - else if (!mMouseOutsideSlop + if (!handleMediaHover(mHoverPick) + && !mMouseOutsideSlop && mMouseButtonDown // disable camera steering if click on land is not used for moving && gViewerInput.isMouseBindUsed(CLICK_LEFT, MASK_NONE, MODE_THIRD_PERSON)) @@ -789,7 +779,6 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask) if (click_action_object && useClickAction(mask, click_action_object, click_action_object->getRootEdit())) { - show_highlight = true; ECursorType cursor = cursorFromObject(click_action_object); gViewerWindow->setCursor(cursor); LL_DEBUGS("UserInput") << "hover handled by LLToolPie (inactive)" << LL_ENDL; @@ -798,7 +787,6 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask) else if ((object && !object->isAvatar() && object->flagUsePhysics()) || (parent && !parent->isAvatar() && parent->flagUsePhysics())) { - show_highlight = true; gViewerWindow->setCursor(UI_CURSOR_TOOLGRAB); LL_DEBUGS("UserInput") << "hover handled by LLToolPie (inactive)" << LL_ENDL; } @@ -806,7 +794,6 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask) && ((object && object->flagHandleTouch()) || (parent && parent->flagHandleTouch())) && (!object || !object->isAvatar())) { - show_highlight = true; gViewerWindow->setCursor(UI_CURSOR_HAND); LL_DEBUGS("UserInput") << "hover handled by LLToolPie (inactive)" << LL_ENDL; } |