aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterimagepreview.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:54 -0500
committerJacek Antonelli2008-08-15 23:44:54 -0500
commitb2afb8800bb033a04bb3ecdf0363068d56648ef1 (patch)
tree3568129b5bbddb47cd39d622b4137a8fbff4abaf /linden/indra/newview/llfloaterimagepreview.cpp
parentSecond Life viewer sources 1.14.0.1 (diff)
downloadmeta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.zip
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.gz
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.bz2
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.xz
Second Life viewer sources 1.15.0.2
Diffstat (limited to 'linden/indra/newview/llfloaterimagepreview.cpp')
-rw-r--r--linden/indra/newview/llfloaterimagepreview.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/linden/indra/newview/llfloaterimagepreview.cpp b/linden/indra/newview/llfloaterimagepreview.cpp
index 9c68ca8..9237380 100644
--- a/linden/indra/newview/llfloaterimagepreview.cpp
+++ b/linden/indra/newview/llfloaterimagepreview.cpp
@@ -4,6 +4,7 @@
4 * 4 *
5 * Copyright (c) 2004-2007, Linden Research, Inc. 5 * Copyright (c) 2004-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
@@ -375,7 +376,7 @@ BOOL LLFloaterImagePreview::handleMouseDown(S32 x, S32 y, MASK mask)
375 if (mPreviewRect.pointInRect(x, y)) 376 if (mPreviewRect.pointInRect(x, y))
376 { 377 {
377 bringToFront( x, y ); 378 bringToFront( x, y );
378 gViewerWindow->setMouseCapture(this, onMouseCaptureLost); 379 gViewerWindow->setMouseCapture(this);
379 gViewerWindow->hideCursor(); 380 gViewerWindow->hideCursor();
380 mLastMouseX = x; 381 mLastMouseX = x;
381 mLastMouseY = y; 382 mLastMouseY = y;
@@ -390,7 +391,7 @@ BOOL LLFloaterImagePreview::handleMouseDown(S32 x, S32 y, MASK mask)
390//----------------------------------------------------------------------------- 391//-----------------------------------------------------------------------------
391BOOL LLFloaterImagePreview::handleMouseUp(S32 x, S32 y, MASK mask) 392BOOL LLFloaterImagePreview::handleMouseUp(S32 x, S32 y, MASK mask)
392{ 393{
393 gViewerWindow->setMouseCapture(FALSE, NULL); 394 gViewerWindow->setMouseCapture(FALSE);
394 gViewerWindow->showCursor(); 395 gViewerWindow->showCursor();
395 return LLFloater::handleMouseUp(x, y, mask); 396 return LLFloater::handleMouseUp(x, y, mask);
396} 397}
@@ -402,7 +403,7 @@ BOOL LLFloaterImagePreview::handleHover(S32 x, S32 y, MASK mask)
402{ 403{
403 MASK local_mask = mask & ~MASK_ALT; 404 MASK local_mask = mask & ~MASK_ALT;
404 405
405 if (mAvatarPreview && gViewerWindow->hasMouseCapture(this)) 406 if (mAvatarPreview && hasMouseCapture())
406 { 407 {
407 if (local_mask == MASK_PAN) 408 if (local_mask == MASK_PAN)
408 { 409 {