diff options
author | Oz Linden <oz@lindenlab.com> | 2011-12-13 10:23:22 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-12-13 10:23:22 -0500 |
commit | d5f48181b50d9e941abafd76692359869e71a36d (patch) | |
tree | 66f2a744ca09c0ff483038ed639a5dd552cd5272 /indra/llprimitive/lltextureanim.cpp | |
parent | 34b1982d33c83bb58c95bcedf36c9b5cd097584f (diff) | |
parent | dbc91a7fac9513bdd879c5c2dc82208e08eaad2d (diff) |
merge up to latest 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)); |