diff options
author | Brett Joseph <bjoseph@vivox.com> | 2015-05-11 09:52:18 -0400 |
---|---|---|
committer | Brett Joseph <bjoseph@vivox.com> | 2015-05-11 09:52:18 -0400 |
commit | 43b7fe66db159faaa84d545f97818e7a6f0f6920 (patch) | |
tree | 6581ed36e716f6aa57b01f2861d6812294fb2261 /indra/newview/lljoystickbutton.cpp | |
parent | 7cc3e9b3cf8d70fce2ba0d4a398824e599fc8c5d (diff) | |
parent | e611e35e033e99f619b0e4938f6879c8e387efd5 (diff) |
Merged lindenlab/viewer-tools-update into default
Diffstat (limited to 'indra/newview/lljoystickbutton.cpp')
-rwxr-xr-x | indra/newview/lljoystickbutton.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lljoystickbutton.cpp b/indra/newview/lljoystickbutton.cpp index d38f90015e..59e14e6cc0 100755 --- a/indra/newview/lljoystickbutton.cpp +++ b/indra/newview/lljoystickbutton.cpp @@ -424,6 +424,7 @@ void LLJoystickCameraRotate::updateSlop() BOOL LLJoystickCameraRotate::handleMouseDown(S32 x, S32 y, MASK mask) { + gAgent.setMovementLocked(TRUE); updateSlop(); // Set initial offset based on initial click location @@ -465,6 +466,11 @@ BOOL LLJoystickCameraRotate::handleMouseDown(S32 x, S32 y, MASK mask) return LLJoystick::handleMouseDown(x, y, mask); } +BOOL LLJoystickCameraRotate::handleMouseUp(S32 x, S32 y, MASK mask) +{ + gAgent.setMovementLocked(FALSE); + return LLJoystick::handleMouseUp(x, y, mask); +} void LLJoystickCameraRotate::onHeldDown() { |