Skip to content
Snippets Groups Projects
Commit c40bd819 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Fix movement getting stuck when clicking around camera floater

parent 58a49da9
No related branches found
No related tags found
2 merge requests!3Update to main branch,!2Rebase onto current main branch
...@@ -446,7 +446,6 @@ void LLJoystickCameraRotate::updateSlop() ...@@ -446,7 +446,6 @@ void LLJoystickCameraRotate::updateSlop()
BOOL LLJoystickCameraRotate::handleMouseDown(S32 x, S32 y, MASK mask) BOOL LLJoystickCameraRotate::handleMouseDown(S32 x, S32 y, MASK mask)
{ {
gAgent.setMovementLocked(TRUE);
updateSlop(); updateSlop();
// Set initial offset based on initial click location // Set initial offset based on initial click location
...@@ -494,7 +493,12 @@ BOOL LLJoystickCameraRotate::handleMouseDown(S32 x, S32 y, MASK mask) ...@@ -494,7 +493,12 @@ BOOL LLJoystickCameraRotate::handleMouseDown(S32 x, S32 y, MASK mask)
mInitialQuadrant = JQ_RIGHT; 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) BOOL LLJoystickCameraRotate::handleMouseUp(S32 x, S32 y, MASK mask)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment