diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-05-26 18:34:41 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-05-26 18:34:41 -0400 |
| commit | d5f96c38e6f5838672c87e540aaaa3b1663837f8 (patch) | |
| tree | 3aac617ceed3eb3ae2a1aa6cfaca9bb96d4ff4c7 /indra/llmath/tests/v3dmath_test.cpp | |
| parent | 84202f19a52b8d04bf900a72acf4214b73acc820 (diff) | |
| parent | 4b7793a119f4e4c8c4f03b6ff9adb0eb6fe94209 (diff) | |
merge from viewer-pre-beta
Diffstat (limited to 'indra/llmath/tests/v3dmath_test.cpp')
| -rw-r--r-- | indra/llmath/tests/v3dmath_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmath/tests/v3dmath_test.cpp b/indra/llmath/tests/v3dmath_test.cpp index b67346f4e5..20b26faa12 100644 --- a/indra/llmath/tests/v3dmath_test.cpp +++ b/indra/llmath/tests/v3dmath_test.cpp @@ -30,11 +30,11 @@ #include "llsd.h" #include "../test/lltut.h" -#include "../llquaternion.h" #include "../m3math.h" #include "../v4math.h" #include "../v3dmath.h" #include "../v3dmath.h" +#include "../llquaternion.h" namespace tut { @@ -403,7 +403,7 @@ namespace tut LLVector3d vec3D(x,y,z); F64 res = (x*x + y*y + z*z) - vec3D.magVecSquared(); ensure("1:magVecSquared:Fail ", ((-F_APPROXIMATELY_ZERO <= res)&& (res <=F_APPROXIMATELY_ZERO))); - res = fsqrtf(x*x + y*y + z*z) - vec3D.magVec(); + res = (F32) sqrt(x*x + y*y + z*z) - vec3D.magVec(); ensure("2:magVec: Fail ", ((-F_APPROXIMATELY_ZERO <= res)&& (res <=F_APPROXIMATELY_ZERO))); } |