diff options
| author | prep <prep@lindenlab.com> | 2013-02-28 11:13:38 -0500 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2013-02-28 11:13:38 -0500 |
| commit | 852ccab7a3fd322044a3918b8df4dfc0f6784576 (patch) | |
| tree | 61a2e625c0c28282875994597152bef67e6faa4f /indra/llprimitive/llprimitive.cpp | |
| parent | 03b51b779fd545e63b6f2fa2ef5ba28f21f1ae62 (diff) | |
| parent | 83eda3f1524a08fa6fc4fbd836c92ae95e8100bc (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); |