diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-11-29 12:10:14 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-11-29 12:10:14 -0600 |
| commit | 1da7f4222479cc98bb85341de6a3bc93cd6fa4b4 (patch) | |
| tree | dea648af2d44204f1abf1e84f07ede3317629157 /indra/llprimitive | |
| parent | 5374e544ed5888548bea334bd8ca7ca53372d031 (diff) | |
| parent | 06a2d4eb274b1cd02b82bf2e5ffb458880ae8517 (diff) | |
merge
Diffstat (limited to 'indra/llprimitive')
| -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)); |