From fb793870fe95f1951d7c30ea6068e187b9dededd Mon Sep 17 00:00:00 2001
From: Mark Palange <palange@lindenlab.com>
Date: Tue, 23 Dec 2008 19:39:58 +0000
Subject: QAR-1142 merging 1.22 RC0-RC4 changes. svn merge -c 106471
 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge

---
 indra/llwindow/llwindowwin32.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/llwindow')

diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 76313d82bf..da9216cef6 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -1559,7 +1559,13 @@ void LLWindowWin32::captureMouse()
 
 void LLWindowWin32::releaseMouse()
 {
+	// *NOTE:Mani ReleaseCapture will spawn new windows messages...
+	// which will in turn call our MainWindowProc. It therefore requires
+	// pausing *and more importantly resumption* of the mainlooptimeout...
+	// just like DispatchMessage below.
+	mCallbacks->handlePauseWatchdog(this);
 	ReleaseCapture();
+	mCallbacks->handleResumeWatchdog(this);
 }
 
 
-- 
cgit v1.2.3