diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-18 07:33:08 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-18 07:33:08 -0400 |
| commit | 5eb6cb8d86cf19da79d034df52a0254079f2c95f (patch) | |
| tree | cd2853e9c7c2cbf0bce317ca9018a6f4fa46a23f /indra/newview/llviewerjoystick.cpp | |
| parent | 66c078de5e5a6b685d435f7b1a462d64ca80f35e (diff) | |
| parent | 644cbc44871992a95bcd5a6854dfc2a4d56a7b62 (diff) | |
merge up latest viewer-development (post mesh)
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) |