diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-02-28 23:34:59 +0000 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-02-28 23:34:59 +0000 |
| commit | fa29880ecd1ca9fb34507e1b712b111a7a3bb63e (patch) | |
| tree | 4d2b4aec4ac8317a88cbd205fb8f5f5b0387af9a /indra/llprimitive/llprimitive.cpp | |
| parent | fa3f91e454ac82beffe4aca3789445e8ddf2b27f (diff) | |
| parent | 3005bdf7aa628953bf640c1ab69ea7299b5876b1 (diff) | |
merge
Diffstat (limited to 'indra/llprimitive/llprimitive.cpp')
| -rwxr-xr-x | indra/llprimitive/llprimitive.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp index cf6a3f97d2..c340fc2d35 100755 --- a/indra/llprimitive/llprimitive.cpp +++ b/indra/llprimitive/llprimitive.cpp @@ -1259,7 +1259,7 @@ S32 LLPrimitive::parseTEMessage(LLMessageSystem* mesgsys, char const* block_name mesgsys->getBinaryDataFast(block_name, _PREHASH_TextureEntry, tec.packed_buffer, 0, block_num, LLTEContents::MAX_TE_BUFFER); } - tec.face_count = llmin((U32)getNumTEs(),LLTEContents::MAX_TES); + tec.face_count = llmin((U32)getNumTEs(),(U32)LLTEContents::MAX_TES); U8 *cur_ptr = tec.packed_buffer; cur_ptr += unpackTEField(cur_ptr, tec.packed_buffer+tec.size, (U8 *)tec.image_data, 16, tec.face_count, MVT_LLUUID); |