livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backout 23cbd2ebb8aa again because MAINT-3870 should fix the cam issues

Ansariel 2014-04-16 21:45:59 +02:00
parent e836bbc79b
commit 919d66ca5a
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llviewerwindow.cpp
View File

@ -3648,9 +3648,6 @@ void LLViewerWindow::updateUI()
updateLayout();
// <FS:Ansariel> 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
// <FS:Ansariel> Backout MAINT-3250
//mLastMousePoint = mCurrentMousePoint;
mLastMousePoint = mCurrentMousePoint;
if (point.mX < 0)
{

18
indra/newview/llworldmapview.cpp
View File

@ -1696,16 +1696,6 @@ void LLWorldMapView::handleClick(S32 x, S32 y, MASK mask,
}
// <FS:Ansariel> 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);
}
// </FS:Ansariel>
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())
{
// <FS:Ansariel> Backout MAINT-3250
//if (mPanning || llabs(x - mMouseDownX) > 1 || llabs(y - mMouseDownY) > 1)
if (mPanning || outside_slop(x, y, mMouseDownX, mMouseDownY))
// </FS:Ansariel>
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;
// <FS:Ansariel> Backout MAINT-3250
gViewerWindow->moveCursorToCenter();
}
// doesn't matter, cursor should be hidden