diff options
author | Dave Parks <davep@lindenlab.com> | 2011-05-16 16:11:56 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-05-16 16:11:56 -0500 |
commit | 26f321bf6530734173792f92316b32c470cc1b20 (patch) | |
tree | b6c913bc714ce29ee559a0da49c6318051637789 /indra/newview/llviewerjoystick.cpp | |
parent | 113f532ee57eeeca4dc7eb6ca05f923f1f3543d3 (diff) | |
parent | 8ae550996c70df16b707f6773666b93409123689 (diff) |
merge
Diffstat (limited to 'indra/newview/llviewerjoystick.cpp')
-rw-r--r-- | indra/newview/llviewerjoystick.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerjoystick.cpp b/indra/newview/llviewerjoystick.cpp index e1dd72dddc..fbf11f20db 100644 --- a/indra/newview/llviewerjoystick.cpp +++ b/indra/newview/llviewerjoystick.cpp @@ -758,7 +758,7 @@ void LLViewerJoystick::moveAvatar(bool reset) sDelta[RX_I] += (cur_delta[RX_I] - sDelta[RX_I]) * time * feather; sDelta[RY_I] += (cur_delta[RY_I] - sDelta[RY_I]) * time * feather; - handleRun(fsqrtf(sDelta[Z_I]*sDelta[Z_I] + sDelta[X_I]*sDelta[X_I])); + handleRun((F32) sqrt(sDelta[Z_I]*sDelta[Z_I] + sDelta[X_I]*sDelta[X_I])); // Allow forward/backward movement some priority if (dom_axis == Z_I) |