diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2014-12-03 11:58:41 +0200 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2014-12-03 11:58:41 +0200 |
| commit | 0a32de770d6ec82bb89b86d0d278470602eeb355 (patch) | |
| tree | a258da3c3f11333365f5ca51bd0127841cb8cb38 /indra/newview/lljoystickbutton.cpp | |
| parent | 8c8bef36c049e78cc524e71fb6f740426fb3ce70 (diff) | |
MAINT-1871 FIXED Don't allow moving avatar while changing camera position.
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() { |