diff options
| author | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-03-13 16:16:17 -0700 |
|---|---|---|
| committer | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-03-13 16:16:17 -0700 |
| commit | 9a811855b9470accba062e10fd2f591588492ab2 (patch) | |
| tree | ad7ad314c7785d9e87ef9b2dfb635f84f3048a51 /indra/llmath | |
| parent | 9a7a19c77ad1b143c7acfa915af7887e417253f1 (diff) | |
| parent | 5d2fea6262d91eb8d3c06d97a160ca9373b96889 (diff) | |
Merge
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/llvector4a.h | 4 | ||||
| -rw-r--r-- | indra/llmath/llvolume.cpp | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/indra/llmath/llvector4a.h b/indra/llmath/llvector4a.h index 1a478bc8de..0526793d3a 100644 --- a/indra/llmath/llvector4a.h +++ b/indra/llmath/llvector4a.h @@ -93,11 +93,7 @@ public: LLVector4a() { //DO NOT INITIALIZE -- The overhead is completely unnecessary -// This assert is causing spurious referenced before set warnings on GCC 4.3.4 -// -#if !LL_LINUX ll_assert_aligned(this,16); -#endif } LLVector4a(F32 x, F32 y, F32 z, F32 w = 0.f) diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index edd16b5688..602f2c29e5 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -4729,13 +4729,13 @@ void LLVolumeFace::optimize(F32 angle_cutoff) } } - // disallow data amplification + // Only swap data if we've actually optimized the mesh // if (new_face.mNumVertices <= mNumVertices) { - llassert(new_face.mNumIndices == mNumIndices); - swapData(new_face); - } + llassert(new_face.mNumIndices == mNumIndices); + swapData(new_face); + } } class LLVCacheTriangleData; |