diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-04-14 18:53:17 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-04-14 18:53:17 +0300 |
| commit | 1dd7e76908277f0ad4b24a8e320aa2b9f9321048 (patch) | |
| tree | c9ca7fd71fdf533c7f500828e1e708dc5d7af5ac /indra/newview/lljoystickbutton.cpp | |
| parent | 3e0483df17181269c4cada7ad5585201f442598c (diff) | |
| parent | a647b8f1cbab13f07ea889c80df28414bc906129 (diff) | |
Merge with viewer-release and become 3.7.28
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() { |