diff options
Diffstat (limited to 'linden/indra/newview/llpreview.cpp')
-rw-r--r-- | linden/indra/newview/llpreview.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/linden/indra/newview/llpreview.cpp b/linden/indra/newview/llpreview.cpp index 534513f..347c6d5 100644 --- a/linden/indra/newview/llpreview.cpp +++ b/linden/indra/newview/llpreview.cpp | |||
@@ -4,6 +4,7 @@ | |||
4 | * | 4 | * |
5 | * Copyright (c) 2002-2007, Linden Research, Inc. | 5 | * Copyright (c) 2002-2007, Linden Research, Inc. |
6 | * | 6 | * |
7 | * Second Life Viewer Source Code | ||
7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
@@ -328,7 +329,7 @@ BOOL LLPreview::handleMouseDown(S32 x, S32 y, MASK mask) | |||
328 | // No handler needed for focus lost since this class has no | 329 | // No handler needed for focus lost since this class has no |
329 | // state that depends on it. | 330 | // state that depends on it. |
330 | bringToFront(x, y); | 331 | bringToFront(x, y); |
331 | gFocusMgr.setMouseCapture(this, NULL); | 332 | gFocusMgr.setMouseCapture(this); |
332 | S32 screen_x; | 333 | S32 screen_x; |
333 | S32 screen_y; | 334 | S32 screen_y; |
334 | localPointToScreen(x, y, &screen_x, &screen_y ); | 335 | localPointToScreen(x, y, &screen_x, &screen_y ); |
@@ -340,9 +341,9 @@ BOOL LLPreview::handleMouseDown(S32 x, S32 y, MASK mask) | |||
340 | 341 | ||
341 | BOOL LLPreview::handleMouseUp(S32 x, S32 y, MASK mask) | 342 | BOOL LLPreview::handleMouseUp(S32 x, S32 y, MASK mask) |
342 | { | 343 | { |
343 | if(gFocusMgr.getMouseCapture() == this) | 344 | if(hasMouseCapture()) |
344 | { | 345 | { |
345 | gFocusMgr.setMouseCapture(NULL, NULL); | 346 | gFocusMgr.setMouseCapture(NULL); |
346 | return TRUE; | 347 | return TRUE; |
347 | } | 348 | } |
348 | return LLFloater::handleMouseUp(x, y, mask); | 349 | return LLFloater::handleMouseUp(x, y, mask); |
@@ -350,7 +351,7 @@ BOOL LLPreview::handleMouseUp(S32 x, S32 y, MASK mask) | |||
350 | 351 | ||
351 | BOOL LLPreview::handleHover(S32 x, S32 y, MASK mask) | 352 | BOOL LLPreview::handleHover(S32 x, S32 y, MASK mask) |
352 | { | 353 | { |
353 | if(gFocusMgr.getMouseCapture() == this) | 354 | if(hasMouseCapture()) |
354 | { | 355 | { |
355 | S32 screen_x; | 356 | S32 screen_x; |
356 | S32 screen_y; | 357 | S32 screen_y; |