aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerjoystick.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-10-03 18:05:46 -0500
committerJacek Antonelli2008-10-03 18:06:00 -0500
commit04f9d0b7cef929ad9acdea37bf5f826850993c52 (patch)
tree4f89e6ad443f04b66d562af0bbae7e95cb44dc24 /linden/indra/newview/llviewerjoystick.cpp
parentSecond Life viewer sources 1.21.3-RC (diff)
downloadmeta-impy-04f9d0b7cef929ad9acdea37bf5f826850993c52.zip
meta-impy-04f9d0b7cef929ad9acdea37bf5f826850993c52.tar.gz
meta-impy-04f9d0b7cef929ad9acdea37bf5f826850993c52.tar.bz2
meta-impy-04f9d0b7cef929ad9acdea37bf5f826850993c52.tar.xz
Second Life viewer sources 1.21.4-RC
Diffstat (limited to 'linden/indra/newview/llviewerjoystick.cpp')
-rw-r--r--linden/indra/newview/llviewerjoystick.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/linden/indra/newview/llviewerjoystick.cpp b/linden/indra/newview/llviewerjoystick.cpp
index 2e57843..2e4ce0b 100644
--- a/linden/indra/newview/llviewerjoystick.cpp
+++ b/linden/indra/newview/llviewerjoystick.cpp
@@ -386,7 +386,7 @@ void LLViewerJoystick::agentRotate(F32 pitch_inc, F32 yaw_inc)
386} 386}
387 387
388// ----------------------------------------------------------------------------- 388// -----------------------------------------------------------------------------
389void LLViewerJoystick::resetDeltas(S32 axis[], bool flycam_and_build_mode) 389void LLViewerJoystick::resetDeltas(S32 axis[])
390{ 390{
391 for (U32 i = 0; i < 6; i++) 391 for (U32 i = 0; i < 6; i++)
392 { 392 {
@@ -394,13 +394,6 @@ void LLViewerJoystick::resetDeltas(S32 axis[], bool flycam_and_build_mode)
394 sDelta[i] = 0.f; 394 sDelta[i] = 0.f;
395 } 395 }
396 396
397 if (flycam_and_build_mode)
398 {
399 sLastDelta[X_I] /= BUILDMODE_FLYCAM_T_SCALE;
400 sLastDelta[Y_I] /= BUILDMODE_FLYCAM_T_SCALE;
401 sLastDelta[Z_I] /= BUILDMODE_FLYCAM_T_SCALE;
402 }
403
404 sLastDelta[6] = sDelta[6] = 0.f; 397 sLastDelta[6] = sDelta[6] = 0.f;
405 mResetFlag = false; 398 mResetFlag = false;
406} 399}
@@ -755,7 +748,7 @@ void LLViewerJoystick::moveFlycam(bool reset)
755 sFlycamRotation = LLViewerCamera::getInstance()->getQuaternion(); 748 sFlycamRotation = LLViewerCamera::getInstance()->getQuaternion();
756 sFlycamZoom = LLViewerCamera::getInstance()->getView(); 749 sFlycamZoom = LLViewerCamera::getInstance()->getView();
757 750
758 resetDeltas(axis, in_build_mode); 751 resetDeltas(axis);
759 752
760 return; 753 return;
761 } 754 }