summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authormaksymsproductengine <maksymsproductengine@lindenlab.com>2013-10-23 18:11:56 +0300
committermaksymsproductengine <maksymsproductengine@lindenlab.com>2013-10-23 18:11:56 +0300
commitb1c943859bc8b6316d2f4530014f9fb0fb65e66f (patch)
tree77fd94dbb438ef263055446cd0cc9ef47d8cc362 /indra
parent9a117c4b5d4576c8b6863fea156e14e92e13eede (diff)
MAINT-3250 FIXED [TUI] Dragging on the Map does not working correctly
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llviewerwindow.cpp5
-rwxr-xr-xindra/newview/llworldmapview.cpp12
2 files changed, 4 insertions, 13 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index ef5021816e..3193a2955b 100755
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -3244,8 +3244,6 @@ void LLViewerWindow::updateUI()
updateLayout();
- mLastMousePoint = mCurrentMousePoint;
-
// cleanup unused selections when no modal dialogs are open
if (LLModalDialog::activeCount() == 0)
{
@@ -3483,6 +3481,9 @@ void LLViewerWindow::saveLastMouse(const LLCoordGL &point)
{
// Store last mouse location.
// If mouse leaves window, pretend last point was on edge of window
+
+ mLastMousePoint = mCurrentMousePoint;
+
if (point.mX < 0)
{
mCurrentMousePoint.mX = 0;
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