diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-02-20 11:10:41 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-02-20 11:10:41 -0500 |
| commit | 6f11fb2588735c5f137de1c7f00a56d90f2f28a1 (patch) | |
| tree | 5a6154ca86b1ddc9e314895c5d4f6d5c544cb362 /indra/llprimitive | |
| parent | 429d8250ddfae3806b49fe9eb299220dd994ed80 (diff) | |
| parent | ce9a15bf989224ccda03d2d8461a3c619ae4339d (diff) | |
merge
Diffstat (limited to 'indra/llprimitive')
| -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 faf98883d9..cf6a3f97d2 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 = getNumTEs(); + tec.face_count = llmin((U32)getNumTEs(),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); |