From f22d659c6f2d9d99749be532730c09d283598e2e Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 17 Dec 2021 19:12:36 +0200 Subject: SL-16517 Dragging a physic object momentarily moves it to an incorrect location. --- indra/newview/lltoolgrab.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/lltoolgrab.cpp') diff --git a/indra/newview/lltoolgrab.cpp b/indra/newview/lltoolgrab.cpp index f01b374db1..a0229b4edf 100644 --- a/indra/newview/lltoolgrab.cpp +++ b/indra/newview/lltoolgrab.cpp @@ -529,8 +529,8 @@ void LLToolGrabBase::handleHoverActive(S32 x, S32 y, MASK mask) const F32 RADIANS_PER_PIXEL_X = 0.01f; const F32 RADIANS_PER_PIXEL_Y = 0.01f; - S32 dx = x - (gViewerWindow->getWorldViewWidthScaled() / 2); - S32 dy = y - (gViewerWindow->getWorldViewHeightScaled() / 2); + S32 dx = gViewerWindow->getCurrentMouseDX() / 2; + S32 dy = gViewerWindow->getCurrentMouseDY() / 2; if (dx != 0 || dy != 0) { -- cgit v1.2.3 From 91940a0e2ce7324288aa38aefd4e5050de3a9263 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 17 Dec 2021 19:12:36 +0200 Subject: SL-16517 Dragging a physic object #2 mLastMouseX/Y might need to be assigned from gViewerWindow->getCurrentMouseX(); --- indra/newview/lltoolgrab.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/lltoolgrab.cpp') diff --git a/indra/newview/lltoolgrab.cpp b/indra/newview/lltoolgrab.cpp index a0229b4edf..6216899dc6 100644 --- a/indra/newview/lltoolgrab.cpp +++ b/indra/newview/lltoolgrab.cpp @@ -529,8 +529,8 @@ void LLToolGrabBase::handleHoverActive(S32 x, S32 y, MASK mask) const F32 RADIANS_PER_PIXEL_X = 0.01f; const F32 RADIANS_PER_PIXEL_Y = 0.01f; - S32 dx = gViewerWindow->getCurrentMouseDX() / 2; - S32 dy = gViewerWindow->getCurrentMouseDY() / 2; + S32 dx = gViewerWindow->getCurrentMouseDX(); + S32 dy = gViewerWindow->getCurrentMouseDY(); if (dx != 0 || dy != 0) { -- cgit v1.2.3