diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-03-10 15:30:38 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-03-10 15:30:38 -0700 |
| commit | 8b5ce1e474ac621fc0d8da029e710734792e319d (patch) | |
| tree | d5ad22286bd84418d9ba6356017003d891165243 /indra/newview/llworldmapview.cpp | |
| parent | c64e878333ed86c83b0d82c10cc61d4d8d3e8af2 (diff) | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llworldmapview.cpp')
| -rwxr-xr-x | indra/newview/llworldmapview.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp index ae334d4bd2..786e4f2de6 100755 --- a/indra/newview/llworldmapview.cpp +++ b/indra/newview/llworldmapview.cpp @@ -1595,14 +1595,6 @@ void LLWorldMapView::handleClick(S32 x, S32 y, MASK mask, } -BOOL outside_slop(S32 x, S32 y, S32 start_x, S32 start_y) -{ - S32 dx = x - start_x; - S32 dy = y - start_y; - - return (dx <= -2 || 2 <= dx || dy <= -2 || 2 <= dy); -} - BOOL LLWorldMapView::handleMouseDown( S32 x, S32 y, MASK mask ) { gFocusMgr.setMouseCapture( this ); @@ -1685,7 +1677,7 @@ BOOL LLWorldMapView::handleHover( S32 x, S32 y, MASK mask ) { if (hasMouseCapture()) { - if (mPanning || outside_slop(x, y, mMouseDownX, mMouseDownY)) + if (mPanning || llabs(x - mMouseDownX) > 1 || llabs(y - mMouseDownY) > 1) { // just started panning, so hide cursor if (!mPanning) @@ -1702,8 +1694,6 @@ BOOL LLWorldMapView::handleHover( S32 x, S32 y, MASK mask ) sPanY += delta_y; sTargetPanX = sPanX; sTargetPanY = sPanY; - - gViewerWindow->moveCursorToCenter(); } // doesn't matter, cursor should be hidden |