summaryrefslogtreecommitdiff
path: root/indra/llprimitive/llmodel.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-08-02 11:53:42 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-08-02 11:53:42 -0400
commit86d33e21a73e1f9db5b88b7169e32070c488bb48 (patch)
tree6c09925f34719c43c543dc23c8095af7a2c392d9 /indra/llprimitive/llmodel.cpp
parent22b1223ea7d68b27304cdd713f8e8b491b654060 (diff)
parentb7555a3309bda8e9689627901051aa90fcb7be34 (diff)
merge
Diffstat (limited to 'indra/llprimitive/llmodel.cpp')
-rw-r--r--indra/llprimitive/llmodel.cpp3
1 files changed, 2 insertions, 1 deletions
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
{