diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-09-12 18:44:30 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-09-12 18:44:30 -0400 |
| commit | 3f71d3b41c938fd5d433da6ca1b404586c49c401 (patch) | |
| tree | 0ec16a8f4a8fed65834a0776097f074073cf0fa4 /indra/newview/llfloatermodelpreview.cpp | |
| parent | a11cc73736b6824e4dc6d0a693bcfb26514b16eb (diff) | |
| parent | 3a36e3c6a82462b8d01e47707391be168e739b66 (diff) | |
re-merge changes to disable tcmalloc
Diffstat (limited to 'indra/newview/llfloatermodelpreview.cpp')
| -rwxr-xr-x | indra/newview/llfloatermodelpreview.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 3fe535cbe8..a071f338ba 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) |