diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-05-13 18:34:54 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-05-13 18:34:54 -0400 |
| commit | 73f474d886d2430db3d5c8f7729f769b389730a4 (patch) | |
| tree | 5b1f481284a030c72ac08d8b3027ed608bc3ceb6 /indra/llmath/llvolume.cpp | |
| parent | 81ffd3fccac709a5903dd0d7572db50c50850347 (diff) | |
| parent | 180dd12ed637c1f63a5013d25fbac002e1d94c93 (diff) | |
Merge. Refresh from /lindenlab/viewer-cat prior to pushing.
Diffstat (limited to 'indra/llmath/llvolume.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/llmath/llvolume.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index 602f2c29e5..7751ef87ee 100644..100755 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -4520,7 +4520,11 @@ LLVolumeFace& LLVolumeFace::operator=(const LLVolumeFace& src) S32 tc_size = (mNumVertices*sizeof(LLVector2)+0xF) & ~0xF; LLVector4a::memcpyNonAliased16((F32*) mPositions, (F32*) src.mPositions, vert_size); - LLVector4a::memcpyNonAliased16((F32*) mNormals, (F32*) src.mNormals, vert_size); + + if (src.mNormals) + { + LLVector4a::memcpyNonAliased16((F32*) mNormals, (F32*) src.mNormals, vert_size); + } if(src.mTexCoords) { |