From b2afb8800bb033a04bb3ecdf0363068d56648ef1 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:44:54 -0500
Subject: Second Life viewer sources 1.15.0.2

---
 linden/indra/newview/lljoystickbutton.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'linden/indra/newview/lljoystickbutton.cpp')

diff --git a/linden/indra/newview/lljoystickbutton.cpp b/linden/indra/newview/lljoystickbutton.cpp
index a280ca8..6e62627 100644
--- a/linden/indra/newview/lljoystickbutton.cpp
+++ b/linden/indra/newview/lljoystickbutton.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -134,7 +135,7 @@ BOOL LLJoystick::handleMouseUp(S32 x, S32 y, MASK mask)
 {
 	// llinfos << "joystick mouse up " << x << ", " << y << llendl;
 
-	if( gViewerWindow->hasMouseCapture( this ) )
+	if( hasMouseCapture() )
 	{
 		mLastMouse.set(x, y);
 		mHeldDown = FALSE;
@@ -147,7 +148,7 @@ BOOL LLJoystick::handleMouseUp(S32 x, S32 y, MASK mask)
 
 BOOL LLJoystick::handleHover(S32 x, S32 y, MASK mask)
 {
-	if( gViewerWindow->hasMouseCapture( this ) )
+	if( hasMouseCapture() )
 	{
 		mLastMouse.set(x, y);
 	}
@@ -172,7 +173,9 @@ void LLJoystick::onHeldDown(void *userdata)
 {
 	LLJoystick *self = (LLJoystick *)userdata;
 
-	llassert( gViewerWindow->hasMouseCapture( self ) );
+	// somebody removed this function without checking the
+	// build. Removed 2007-03-26.
+	//llassert( gViewerWindow->hasMouseCapture( self ) );
 
 	self->mHeldDown = TRUE;
 	self->onHeldDown();
-- 
cgit v1.1