diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-12-12 10:54:45 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-12-12 10:54:45 -0800 |
| commit | ec30e6e70ff71723e2137595bc6ecd3eb358aabe (patch) | |
| tree | 49055571f280685a440b1d79415a8004b5f28c7e /indra/llprimitive/lltextureanim.cpp | |
| parent | 6114ce2d27a3c776a59d1f09ad05d9b2f100a35d (diff) | |
| parent | dbc91a7fac9513bdd879c5c2dc82208e08eaad2d (diff) | |
Merge from viewer-development
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)); |