summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2010-02-16 15:43:11 -0800
committerRick Pasetto <rick@lindenlab.com>2010-02-16 15:43:11 -0800
commit4dfed6e353ff880fcd45b4c8b402bf0f5a2f19f2 (patch)
tree5d620ae33a3f1914acf3996c8ba59d33ff2c49e1 /indra/newview/llviewerwindow.cpp
parentfb384e6af40f6a0149d93cdc38d598dd95067fbb (diff)
parent0e234edcc67ecf534df15f088158ef236f6de102 (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)