diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-06-20 17:18:48 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-06-20 17:18:48 -0400 |
| commit | 08fd82ef8f654f62fb1d6b12c5694edd3ef8d55c (patch) | |
| tree | 710749693dd1e60ab258bcc0c687a460caf04731 | |
| parent | f38a42f8cf8434d003e11198b232187f3f98c123 (diff) | |
| parent | 7201d55396be92b18074ac926698688f9067f222 (diff) | |
Automated merge with https://hg.secondlife.com/mesh-development
| -rw-r--r-- | indra/llmath/llvolume.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index 7c7c4306da..d401ce7de7 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -32,6 +32,7 @@ #if !LL_WINDOWS #include <stdint.h> #endif +#include <cmath> #include "llerror.h" #include "llmemtype.h" @@ -2383,8 +2384,8 @@ bool LLVolumeFace::VertexData::compareNormal(const LLVolumeFace::VertexData& rhs const F32 epsilon = 0.00001f; if (rhs.mData[POSITION].equals3(mData[POSITION], epsilon) && - abs(rhs.mTexCoord[0]-mTexCoord[0]) < epsilon && - abs(rhs.mTexCoord[1]-mTexCoord[1]) < epsilon) + fabs(rhs.mTexCoord[0]-mTexCoord[0]) < epsilon && + fabs(rhs.mTexCoord[1]-mTexCoord[1]) < epsilon) { if (angle_cutoff > 1.f) { |