diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-08-27 16:58:33 -0700 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-08-27 16:58:33 -0700 |
| commit | b62b10dd260c8c01e82e5b206c17a410cedc79f4 (patch) | |
| tree | 2ea582bb63476566ddabfbd5a0a8f3747eb3fc8e /indra/llui/lltooltip.cpp | |
| parent | bef304c0a34bfcd7997bd7799995229ddcc1de31 (diff) | |
| parent | 51311875b6e23fa9475c42b6d15637aa668729c5 (diff) | |
Post-convert merge by convert_monolith.py from ./viewer-experience
Diffstat (limited to 'indra/llui/lltooltip.cpp')
| -rw-r--r-- | indra/llui/lltooltip.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/lltooltip.cpp b/indra/llui/lltooltip.cpp index b02d3122fe..2c44b91749 100644 --- a/indra/llui/lltooltip.cpp +++ b/indra/llui/lltooltip.cpp @@ -78,9 +78,9 @@ BOOL LLToolTipView::handleHover(S32 x, S32 y, MASK mask) LLToolTipMgr& tooltip_mgr = LLToolTipMgr::instance(); - if (x != last_x && y != last_y) + if (x != last_x && y != last_y && !tooltip_mgr.getMouseNearRect().pointInRect(x, y)) { - // allow new tooltips because mouse moved + // allow new tooltips because mouse moved outside of mouse near rect tooltip_mgr.unblockToolTips(); } @@ -580,6 +580,7 @@ void LLToolTipMgr::updateToolTipVisibility() if (mToolTip->getVisibleTime() > tooltip_timeout) { hideToolTips(); + unblockToolTips(); } } } |