Merge remote branch 'mccabe/next' into next

1 files changed, 8 insertions, 1 deletions

diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 99bbb2a..df10b4f 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -596,7 +596,14 @@ BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window,  LLCoordGL pos, MASK
         }
 
         // Make sure we get a coresponding mouseup event, even if the mouse leaves the window
-        mWindow->captureMouse();
+        if (down)
+        {
+                mWindow->captureMouse();
+        }
+        else
+        {
+                mWindow->releaseMouse();
+        }
 
         // Indicate mouse was active
         gMouseIdleTimer.reset();