diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-06-20 09:17:56 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-06-20 09:17:56 +0000 |
| commit | 8ed056fde9fe5fc9755158013a5cb8be73066e2c (patch) | |
| tree | d7f5f6de35c99ca645e48dc8817d908cc6d2f348 /indra/llui/llview.cpp | |
| parent | 351ebe9fcb76f3b99c2957004bb8493a904869ee (diff) | |
svn merge -r124872:124873
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.threefour-merge-1a
QAR-1592 Merge of changes between 1.23 RC2 and 1.23 Final to trunk
Diffstat (limited to 'indra/llui/llview.cpp')
| -rw-r--r-- | indra/llui/llview.cpp | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 8ec681fcaf..31788da117 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -743,23 +743,20 @@ BOOL LLView::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_s // don't allow any siblings to handle this event // even if we don't have a tooltip - if (getMouseOpaque() || show_names_text_box) + if (blockMouseEvent(x, y) || show_names_text_box) { - handled = TRUE; - } - - if(!tool_tip.empty()) - { - msg = tool_tip; + if(!tool_tip.empty()) + { + msg = tool_tip; - // Convert rect local to screen coordinates - localPointToScreen( - 0, 0, - &(sticky_rect_screen->mLeft), &(sticky_rect_screen->mBottom) ); - localPointToScreen( - mRect.getWidth(), mRect.getHeight(), - &(sticky_rect_screen->mRight), &(sticky_rect_screen->mTop) ); - + // Convert rect local to screen coordinates + localPointToScreen( + 0, 0, + &(sticky_rect_screen->mLeft), &(sticky_rect_screen->mBottom) ); + localPointToScreen( + mRect.getWidth(), mRect.getHeight(), + &(sticky_rect_screen->mRight), &(sticky_rect_screen->mTop) ); + } handled = TRUE; } |