summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermodelpreview.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-06-27 14:18:22 -0400
committerOz Linden <oz@lindenlab.com>2012-06-27 14:18:22 -0400
commit2c3e78f1f1f5851482e5e63d37af1325f3a19550 (patch)
tree1871ea15c18377defe5e20a198baf8072e791efc /indra/newview/llfloatermodelpreview.cpp
parenteb03da6e993eb33e1fef9bf53268c66d325adf9a (diff)
parentc9f1b1b5113031d5879e8fcdcec263626a7d3122 (diff)
merge changes for DRTVWR-167
Diffstat (limited to 'indra/newview/llfloatermodelpreview.cpp')
-rwxr-xr-xindra/newview/llfloatermodelpreview.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 0a5171245a..35341ef0ea 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -4774,7 +4774,8 @@ void LLModelPreview::genBuffers(S32 lod, bool include_skin_weights)
if (vf.mTexCoords)
{
vb->getTexCoord0Strider(tc_strider);
- LLVector4a::memcpyNonAliased16((F32*) tc_strider.get(), (F32*) vf.mTexCoords, num_vertices*2*sizeof(F32));
+ S32 tex_size = (num_vertices*2*sizeof(F32)+0xF) & ~0xF;
+ LLVector4a::memcpyNonAliased16((F32*) tc_strider.get(), (F32*) vf.mTexCoords, tex_size);
}
if (vf.mNormals)