diff options
| author | nat_linden <nat@lindenlab.com> | 2015-04-15 10:50:46 -0400 |
|---|---|---|
| committer | nat_linden <nat@lindenlab.com> | 2015-04-15 10:50:46 -0400 |
| commit | 75396e1f131137d7f0dfb3f5fdbddeea1ce12fba (patch) | |
| tree | 33ca8281a889107816663e2bacfc44cfeeb9e815 /indra/newview/lljoystickbutton.cpp | |
| parent | e59dbf1b23a13c6a7f1f0d9661d3dcb78ea040f2 (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() { |