summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2020-12-04 17:02:22 +0200
committerMnikolenko Productengine <mnikolenko@productengine.com>2020-12-04 17:02:22 +0200
commite3b910e14113030b79004bf216193c96c6fb9521 (patch)
tree71825507ef941b57c72b5bbbf488a845c892d339 /indra/newview
parentf187d258ecd79e216ab0b0c67146acbe046db78f (diff)
SL-14462 FIXED The wrong mouse cursor is shown when sitting on a touch-scripted object
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/lltoolpie.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 864ce09430..e9dda9a29c 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -691,7 +691,8 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)
LL_DEBUGS("UserInput") << "hover handled by LLToolPie (inactive)" << LL_ENDL;
}
else if ((!object || !object->isAttachment() || object->getClickAction() != CLICK_ACTION_DISABLED)
- && ((object && object->flagHandleTouch()) || (parent && parent->flagHandleTouch())))
+ && ((object && object->flagHandleTouch()) || (parent && parent->flagHandleTouch()))
+ && (object && !object->isAvatar()))
{
show_highlight = true;
gViewerWindow->setCursor(UI_CURSOR_HAND);