summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-03-13 21:13:01 -0500
committerDave Parks <davep@lindenlab.com>2013-03-13 21:13:01 -0500
commitd7a56dbe0d40367a45ac66992ea8cb209fc12a32 (patch)
treec759a83c4579cbc3a2b8ecf8e7d0a9f8a5cf56b1 /indra
parente95563e10d8c906cf4a09a1e2ff773f345a17c44 (diff)
parent5d2fea6262d91eb8d3c06d97a160ca9373b96889 (diff)
Merge
Diffstat (limited to 'indra')
-rw-r--r--indra/llmath/llvector4a.h4
-rw-r--r--indra/llmath/llvolume.cpp2
2 files changed, 1 insertions, 5 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..7f221fd686 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -4733,7 +4733,7 @@ void LLVolumeFace::optimize(F32 angle_cutoff)
//
if (new_face.mNumVertices <= mNumVertices)
{
- llassert(new_face.mNumIndices == mNumIndices);
+ llassert(new_face.mNumIndices == mNumIndices);
swapData(new_face);
}
}