From ea8fb7238e6f12383ee4bc081475fa6235637581 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Sat, 31 Mar 2007 01:41:19 +0000
Subject: svn merge -r 59364:59813
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

---
 indra/newview/lltoolcomp.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/newview/lltoolcomp.cpp')

diff --git a/indra/newview/lltoolcomp.cpp b/indra/newview/lltoolcomp.cpp
index 5d803b4c52..a1c51cfe44 100644
--- a/indra/newview/lltoolcomp.cpp
+++ b/indra/newview/lltoolcomp.cpp
@@ -736,6 +736,11 @@ BOOL LLToolCompGun::handleMouseUp(S32 x, S32 y, MASK mask)
 
 void LLToolCompGun::onMouseCaptureLost()
 {
+	if (mComposite)
+	{
+		mComposite->onMouseCaptureLost();
+		return;
+	}
 	mCur->onMouseCaptureLost();
 
 	// JC - I don't know if this is necessary.  Maybe we could lose capture
-- 
cgit v1.2.3