1 files changed, 8 insertions, 2 deletions

diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 4ef01f3..f8953c0 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -633,7 +633,7 @@ BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window,  LLCoordGL pos, MASK
         }
 
         if (gDebugClicks)
-        {       
+        {
                 llinfos << "ViewerWindow " << buttonname << " mouse " << buttonstatestr << " at " << x << "," << y << llendl;
         }
 
@@ -651,7 +651,11 @@ BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window,  LLCoordGL pos, MASK
         gMouseIdleTimer.reset();
 
         // Hide tooltips on mousedown
-        mToolTipBlocked = down;
+        if (down)
+        {
+                mToolTipBlocked = TRUE;
+                mToolTip->setVisible(FALSE);
+        }
 
         // Also hide hover info on mousedown/mouseup
         if (gHoverView)
@@ -783,6 +787,8 @@ BOOL LLViewerWindow::handleRightMouseDown(LLWindow *window,  LLCoordGL pos, MASK
         x = llround((F32)x / mDisplayScale.mV[VX]);
         y = llround((F32)y / mDisplayScale.mV[VY]);
 
+        LLView::sMouseHandlerMessage.clear();
+
         BOOL down = TRUE;
         BOOL handle = handleAnyMouseClick(window,pos,mask,LLMouseHandler::CLICK_RIGHT,down);
         if (handle)