diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-02-27 11:43:02 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-02-27 11:43:02 -0500 |
| commit | f6671c2a7dd3c07d5d3545314e92c471ac49dad8 (patch) | |
| tree | d59a740245cdc59f4843c72f7c5337066d84eb49 /indra | |
| parent | d9d5c7e0ccec47d57743304c800c5137dd50aa22 (diff) | |
| parent | 998c31ef9e0631eefe07e4e678032ee90c56c859 (diff) | |
merge
Diffstat (limited to 'indra')
| -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); |