Merge pull request #256 from AlchemyViewer/rye/fix-movement-sticking

RyeMutt · web-flow · commit 80fa0fbf541b · 2025-10-06T11:58:39.000-04:00
Fix movement getting stuck when clicking around camera floater
diff --git 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)
+    {
+        gAgent.setMovementLocked(TRUE);
+    }
+    return res;
 }
 
 bool LLJoystickCameraRotate::handleMouseUp(S32 x, S32 y, MASK mask)

Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,6 @@ void LLJoystickCameraRotate::updateSlop()`
`446`	`446`
`447`	`447`	`bool LLJoystickCameraRotate::handleMouseDown(S32 x, S32 y, MASK mask)`
`448`	`448`	`{`
`449`		`- gAgent.setMovementLocked(true);`
`450`	`449`	`updateSlop();`
`451`	`450`
`452`	`451`	`// Set initial offset based on initial click location`
`@@ -494,7 +493,12 @@ bool LLJoystickCameraRotate::handleMouseDown(S32 x, S32 y, MASK mask)`
`494`	`493`	`mInitialQuadrant = JQ_RIGHT;`
`495`	`494`	`}`
`496`	`495`
`497`		`- return LLJoystick::handleMouseDown(x, y, mask);`
	`496`	`+ bool res = LLJoystick::handleMouseDown(x, y, mask);`
	`497`	`+ if (res)`
	`498`	`+ {`
	`499`	`+ gAgent.setMovementLocked(TRUE);`
	`500`	`+ }`
	`501`	`+ return res;`
`498`	`502`	`}`
`499`	`503`
`500`	`504`	`bool LLJoystickCameraRotate::handleMouseUp(S32 x, S32 y, MASK mask)`