From c40bd81978d3caa2aac45fc50a419078663cd435 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 26 Dec 2023 23:52:57 -0500
Subject: [PATCH] Fix movement getting stuck when clicking around camera
floater
---
indra/newview/lljoystickbutton.cpp | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/indra/newview/lljoystickbutton.cpp b/indra/newview/lljoystickbutton.cpp
index 238b2dc66ae..829731d1106 100644
--- a/indra/newview/lljoystickbutton.cpp
+++ b/indra/newview/lljoystickbutton.cpp
@@ -446,7 +446,6 @@ void LLJoystickCameraRotate::updateSlop()
BOOL LLJoystickCameraRotate::handleMouseDown(S32 x, S32 y, MASK mask)
{
- gAgent.setMovementLocked(TRUE);
updateSlop();
// Set initial offset based on initial click location
@@ -494,7 +493,12 @@ BOOL LLJoystickCameraRotate::handleMouseDown(S32 x, S32 y, MASK mask)
mInitialQuadrant = JQ_RIGHT;
}
- return LLJoystick::handleMouseDown(x, y, mask);
+ BOOL res = LLJoystick::handleMouseDown(x, y, mask);
+ if (res != FALSE)
+ {
+ gAgent.setMovementLocked(TRUE);
+ }
+ return res;
}
BOOL LLJoystickCameraRotate::handleMouseUp(S32 x, S32 y, MASK mask)
--
GitLab