diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 1ed7688c9c..07225754a9 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -3648,9 +3648,6 @@ void LLViewerWindow::updateUI() updateLayout(); - // Backout MAINT-3250 - mLastMousePoint = mCurrentMousePoint; - saveLastMouse(mCurrentMousePoint); // cleanup unused selections when no modal dialogs are open @@ -3893,8 +3890,7 @@ void LLViewerWindow::saveLastMouse(const LLCoordGL &point) // Store last mouse location. // If mouse leaves window, pretend last point was on edge of window - // Backout MAINT-3250 - //mLastMousePoint = mCurrentMousePoint; + mLastMousePoint = mCurrentMousePoint; if (point.mX < 0) { diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp index 7e7fe5432b..53ec199ce1 100755 --- a/indra/newview/llworldmapview.cpp +++ b/indra/newview/llworldmapview.cpp @@ -1696,16 +1696,6 @@ void LLWorldMapView::handleClick(S32 x, S32 y, MASK mask, } -// Backout MAINT-3250 -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 ); @@ -1788,10 +1778,7 @@ BOOL LLWorldMapView::handleHover( S32 x, S32 y, MASK mask ) { if (hasMouseCapture()) { - // Backout MAINT-3250 - //if (mPanning || llabs(x - mMouseDownX) > 1 || llabs(y - mMouseDownY) > 1) - 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) @@ -1808,9 +1795,6 @@ BOOL LLWorldMapView::handleHover( S32 x, S32 y, MASK mask ) sPanY += delta_y; sTargetPanX = sPanX; sTargetPanY = sPanY; - - // Backout MAINT-3250 - gViewerWindow->moveCursorToCenter(); } // doesn't matter, cursor should be hidden