diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-11-23 12:05:52 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-11-23 12:05:52 -0600 |
| commit | 249abaa62ba61a69ad669507c92d3a373c8e34f3 (patch) | |
| tree | dd82b3407d2753fa9f762dafe5a7187c95e0cef0 | |
| parent | abf39f788609f65d1b2b3ac1548f7146aa5c8584 (diff) | |
| parent | c69785f0b5625e655838b9cc9779407077ca770e (diff) | |
merge
| -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)); |