summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-01-27 11:04:57 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-01-27 11:04:57 -0500
commitb0d94fa706efd7794b4ba5b9160ddcfc33233ca4 (patch)
treef816de521ed1bde40c2e7ab8901ace4b8fea498e /indra
parent15ec54b1daef88881b0dc9acb0e14290be8e9e5d (diff)
parent8a75b5562b2194d9488a892b51cd19bb75fb32b7 (diff)
merge
Diffstat (limited to 'indra')
-rwxr-xr-xindra/llmath/tests/alignment_test.cpp1
-rw-r--r--indra/llprimitive/llmodel.cpp3
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/llmath/tests/alignment_test.cpp b/indra/llmath/tests/alignment_test.cpp
index 044e05e961..8961b9d6d5 100755
--- a/indra/llmath/tests/alignment_test.cpp
+++ b/indra/llmath/tests/alignment_test.cpp
@@ -62,6 +62,7 @@ class MyVector4a
LLQuad mQ;
} LL_ALIGN_POSTFIX(16);
+
// Verify that aligned allocators perform as advertised.
template<> template<>
void alignment_test_object_t::test<1>()
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index cb32a510b8..28ed051c55 100644
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -1026,7 +1026,8 @@ void LLModel::setVolumeFaceData(
if (tc.get())
{
- LLVector4a::memcpyNonAliased16((F32*) face.mTexCoords, (F32*) tc.get(), num_verts*2*sizeof(F32));
+ U32 tex_size = (num_verts*2*sizeof(F32)+0xF)&~0xF;
+ LLVector4a::memcpyNonAliased16((F32*) face.mTexCoords, (F32*) tc.get(), tex_size);
}
else
{