summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-17 13:50:26 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-17 13:50:26 +0000
commit2398ac98d01d3809904759251e2c98cf2740e139 (patch)
tree644f663d08e39275f76e19a1cab4d34e3cdf75cf /indra/newview/llviewerwindow.cpp
parente2d56363f105f8bef2b05a6bd4c5276db9a60d82 (diff)
parentc3bd736f6c2d51542fb2894542151282144e7388 (diff)
merge from viewer2.
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 333452a50d..fd59ea41b2 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1001,6 +1001,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)