diff options
author | Leslie Linden <none@none> | 2011-06-08 13:41:40 -0700 |
---|---|---|
committer | Leslie Linden <none@none> | 2011-06-08 13:41:40 -0700 |
commit | de78d17e912b7e2a4c563a7a428f11cce33644c0 (patch) | |
tree | 6c415389f180f6a5d879b050670fd6cd3d987229 /indra/newview/llviewerjoystick.cpp | |
parent | 888b39c283e53fd128778e70e231bcb6053de4b8 (diff) | |
parent | 1361eeae4e4538c175a32d48246897c4659cc26c (diff) |
Merge from viewer-experience
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) |