diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-11-23 12:05:24 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-11-23 12:05:24 -0600 |
| commit | c69785f0b5625e655838b9cc9779407077ca770e (patch) | |
| tree | 8ffc0c2c2e8de063f382ef7ff9f84f1f4dc9fe4c /indra/llprimitive/lltextureanim.cpp | |
| parent | 0071e6576f694f9f8ed1bc6537a6201c08dc79dd (diff) | |
SH-2449 Preserve texture scaling when animating textures when "size x" and "size y" parameters to llSetTextureAnim are zero.
Diffstat (limited to 'indra/llprimitive/lltextureanim.cpp')
| -rw-r--r-- | indra/llprimitive/lltextureanim.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llprimitive/lltextureanim.cpp b/indra/llprimitive/lltextureanim.cpp index 398af4e6e8..185a3f69c0 100644 --- a/indra/llprimitive/lltextureanim.cpp +++ b/indra/llprimitive/lltextureanim.cpp @@ -168,8 +168,8 @@ void LLTextureAnim::unpackTAMessage(LLDataPacker &dp) mMode = data[0]; mFace = data[1]; - mSizeX = llmax((U8)1, data[2]); - mSizeY = llmax((U8)1, data[3]); + mSizeX = data[2]; + mSizeY = data[3]; htonmemcpy(&mStart, data + 4, MVT_F32, sizeof(F32)); htonmemcpy(&mLength, data + 8, MVT_F32, sizeof(F32)); htonmemcpy(&mRate, data + 12, MVT_F32, sizeof(F32)); |