summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorWhirly <none@none>2014-08-21 01:07:26 +0100
committerWhirly <none@none>2014-08-21 01:07:26 +0100
commit5634cc990d71d34e330f87e838be44f60f496bd9 (patch)
tree3f001d62f32816bb7e3f8e19961e9c4ea4b7318e /indra
parentfc0d618c2f3489e62b28d6e83978d39ea70c1e7e (diff)
STORM-2078 Make atan2() work with the unnormalized axis
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llmaniprotate.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmaniprotate.cpp b/indra/newview/llmaniprotate.cpp
index 50863ac970..b2350e5a75 100755
--- a/indra/newview/llmaniprotate.cpp
+++ b/indra/newview/llmaniprotate.cpp
@@ -1240,8 +1240,8 @@ LLQuaternion LLManipRotate::dragUnconstrained( S32 x, S32 y )
F32 dist_from_sphere_center = sqrt(delta_x * delta_x + delta_y * delta_y);
LLVector3 axis = mMouseDown % mMouseCur;
- axis.normVec();
F32 angle = atan2(sqrtf(axis * axis), mMouseDown * mMouseCur);
+ axis.normVec();
LLQuaternion sphere_rot( angle, axis );
if (is_approx_zero(1.f - mMouseDown * mMouseCur))