diff options
author | Logan Dethrow <log@lindenlab.com> | 2011-06-01 17:05:38 -0400 |
---|---|---|
committer | Logan Dethrow <log@lindenlab.com> | 2011-06-01 17:05:38 -0400 |
commit | 2662c4b679f0eb2745619dc4fd1dd79af65126f0 (patch) | |
tree | f27ba8675353676d91327fc606b005f0096b2fb9 /indra/llmath/v4coloru.h | |
parent | 4b97f03b04e7df25e5b3622122f6d124d4a5f617 (diff) | |
parent | 2002a39e4db5ba96f4a0a7653f76a3cd55846a31 (diff) |
Merge. Pulling fix for VWR-25862 into bigger cache tree.
Diffstat (limited to 'indra/llmath/v4coloru.h')
-rw-r--r-- | indra/llmath/v4coloru.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmath/v4coloru.h b/indra/llmath/v4coloru.h index 7471aebe02..12da7e2dd7 100644 --- a/indra/llmath/v4coloru.h +++ b/indra/llmath/v4coloru.h @@ -294,7 +294,7 @@ inline const LLColor4U& LLColor4U::setAlpha(U8 a) inline F32 LLColor4U::length(void) const { - return fsqrtf( ((F32)mV[VX]) * mV[VX] + ((F32)mV[VY]) * mV[VY] + ((F32)mV[VZ]) * mV[VZ] ); + return (F32) sqrt( ((F32)mV[VX]) * mV[VX] + ((F32)mV[VY]) * mV[VY] + ((F32)mV[VZ]) * mV[VZ] ); } inline F32 LLColor4U::lengthSquared(void) const @@ -305,7 +305,7 @@ inline F32 LLColor4U::lengthSquared(void) const // deprecated inline F32 LLColor4U::magVec(void) const { - return fsqrtf( ((F32)mV[VX]) * mV[VX] + ((F32)mV[VY]) * mV[VY] + ((F32)mV[VZ]) * mV[VZ] ); + return (F32) sqrt( ((F32)mV[VX]) * mV[VX] + ((F32)mV[VY]) * mV[VY] + ((F32)mV[VZ]) * mV[VZ] ); } // deprecated |