diff options
| author | Mark Palange <palange@lindenlab.com> | 2008-10-08 00:22:32 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2008-10-08 00:22:32 +0000 |
| commit | b807e3df990e6fad25cd0bca94d2959dac042b13 (patch) | |
| tree | aa8b185cac406abe412d76d90a903b450191d84d /indra/newview/llviewerjoystick.cpp | |
| parent | 4296542cd062af425d7744c88d6dd2bd00daf532 (diff) | |
merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes) merge to trunk (for real)
Diffstat (limited to 'indra/newview/llviewerjoystick.cpp')
| -rw-r--r-- | indra/newview/llviewerjoystick.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/indra/newview/llviewerjoystick.cpp b/indra/newview/llviewerjoystick.cpp index 96e6da76b6..899ad2c0d6 100644 --- a/indra/newview/llviewerjoystick.cpp +++ b/indra/newview/llviewerjoystick.cpp @@ -386,7 +386,7 @@ void LLViewerJoystick::agentRotate(F32 pitch_inc, F32 yaw_inc) } // ----------------------------------------------------------------------------- -void LLViewerJoystick::resetDeltas(S32 axis[], bool flycam_and_build_mode) +void LLViewerJoystick::resetDeltas(S32 axis[]) { for (U32 i = 0; i < 6; i++) { @@ -394,13 +394,6 @@ void LLViewerJoystick::resetDeltas(S32 axis[], bool flycam_and_build_mode) sDelta[i] = 0.f; } - if (flycam_and_build_mode) - { - sLastDelta[X_I] /= BUILDMODE_FLYCAM_T_SCALE; - sLastDelta[Y_I] /= BUILDMODE_FLYCAM_T_SCALE; - sLastDelta[Z_I] /= BUILDMODE_FLYCAM_T_SCALE; - } - sLastDelta[6] = sDelta[6] = 0.f; mResetFlag = false; } @@ -755,7 +748,7 @@ void LLViewerJoystick::moveFlycam(bool reset) sFlycamRotation = LLViewerCamera::getInstance()->getQuaternion(); sFlycamZoom = LLViewerCamera::getInstance()->getView(); - resetDeltas(axis, in_build_mode); + resetDeltas(axis); return; } |