summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2010-02-16 15:54:32 -0800
committerRick Pasetto <rick@lindenlab.com>2010-02-16 15:54:32 -0800
commit204ff1edd9139b253e2f2b32fa75c04a737d77bf (patch)
tree7d441a50b18872c6a0e32c91f0a1ca147dc32b29 /indra/newview/llviewerwindow.cpp
parent1513643e62a88531888f330e57aa1eb623061729 (diff)
parent4dfed6e353ff880fcd45b4c8b402bf0f5a2f19f2 (diff)
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rw-r--r--indra/newview/llviewerwindow.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 1dcc7389cb..1669ce6312 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -997,6 +997,7 @@ void LLViewerWindow::handleMouseLeave(LLWindow *window)
// Note: we won't get this if we have captured the mouse.
llassert( gFocusMgr.getMouseCapture() == NULL );
mMouseInWindow = FALSE;
+ LLToolTipMgr::instance().blockToolTips();
}
BOOL LLViewerWindow::handleCloseRequest(LLWindow *window)