diff options
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/llmath/llvector4a.h | 3 | ||||
| -rwxr-xr-x | indra/llmath/llvector4a.inl | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/indra/llmath/llvector4a.h b/indra/llmath/llvector4a.h index 94a61f2b1d..79d0a44551 100755 --- a/indra/llmath/llvector4a.h +++ b/indra/llmath/llvector4a.h @@ -46,6 +46,7 @@ class LLRotation; // of this writing, July 08, 2010) about getting it implemented before you resort to // LLVector3/LLVector4. ///////////////////////////////// +class LLVector4a; LL_ALIGN_PREFIX(16) class LLVector4a @@ -239,7 +240,7 @@ public: // Normalize this vector with respect to the x, y, and z components only. Accurate only to 10-12 bits of precision. W component is destroyed // Same as above except substitutes default vector contents if the vector is non-finite or degenerate due to zero length. // - inline void normalize3fast_checked(LLVector4a* default = NULL); + inline void normalize3fast_checked(LLVector4a* d = 0); // Return true if this vector is normalized with respect to x,y,z up to tolerance inline LLBool32 isNormalized3( F32 tolerance = 1e-3 ) const; diff --git a/indra/llmath/llvector4a.inl b/indra/llmath/llvector4a.inl index 6860252a75..d3e8a1c933 100755 --- a/indra/llmath/llvector4a.inl +++ b/indra/llmath/llvector4a.inl @@ -417,14 +417,14 @@ inline void LLVector4a::normalize3fast() // Normalize this vector with respect to the x, y, and z components only. Accurate only to 10-12 bits of precision. W component is destroyed // Note that this does not consider zero length vectors! -inline void LLVector4a::normalize3fast_checked(LLVector4a* default) +inline void LLVector4a::normalize3fast_checked(LLVector4a* d) { // handle bogus inputs before NaNs are generated below // if (!isFinite3() || (dot3(*this).getF32() < F_APPROXIMATELY_ZERO)) { - if (default) - *this = *default; + if (d) + *this = *d; else set(0,1,0,1); |