summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerjoystick.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-04-21 16:23:00 -0500
committerDave Parks <davep@lindenlab.com>2011-04-21 16:23:00 -0500
commit19857d0cf0eedb76cac4eb8a1a4a0b33de9e4235 (patch)
tree09d6015fedca390d1a259a9911491087cf088df5 /indra/newview/llviewerjoystick.cpp
parent120f31502eb521c1e0abaeb24972f070e7f75bd6 (diff)
parent4bbfdd4c1fc18162960ba61fbdad40940a4cdd89 (diff)
merge
Diffstat (limited to 'indra/newview/llviewerjoystick.cpp')
-rw-r--r--indra/newview/llviewerjoystick.cpp2
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)