diff options
| author | Andrew Meadows <leviathan@lindenlab.com> | 2026-07-22 09:01:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-07-22 09:01:47 -0700 |
| commit | b906284977b120c4c554fd08b78fac62759b160a (patch) | |
| tree | 304a0e31c5137568b4b5b9f109cd774475abc2f3 /indra/llprimitive/llprimitive.cpp | |
| parent | b35e537b5140c2a1d38fe979c2c551f735a6d21e (diff) | |
Defer processing AvatarAppearance until after first ObjectUpdate (#6017)
* make AvatarAppearance a low-priority message
* remember agent_id of unexpected AvatarAppearance message for later
Diffstat (limited to 'indra/llprimitive/llprimitive.cpp')
| -rw-r--r-- | indra/llprimitive/llprimitive.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp index 7a638dd625..fd755e35dd 100644 --- a/indra/llprimitive/llprimitive.cpp +++ b/indra/llprimitive/llprimitive.cpp @@ -1370,6 +1370,12 @@ bool LLPrimitive::packTEMessage(LLDataPacker &dp) const S32 LLPrimitive::parseTEMessage(LLMessageSystem* mesgsys, char const* block_name, const S32 block_num, LLTEContents& tec) { + return parseTEMessage(mesgsys, block_name, block_num, tec, getNumTEs()); +} + +// static +S32 LLPrimitive::parseTEMessage(LLMessageSystem* mesgsys, char const* block_name, const S32 block_num, LLTEContents& tec, U8 face_count) +{ S32 retval = 0; // temp buffer for material ID processing // data will end up in tec.material_id[] @@ -1403,7 +1409,7 @@ S32 LLPrimitive::parseTEMessage(LLMessageSystem* mesgsys, char const* block_name tec.packed_buffer[tec.size] = 0x00; ++tec.size; - tec.face_count = llmin((U32)getNumTEs(),(U32)LLTEContents::MAX_TES); + tec.face_count = llmin((U32)face_count,(U32)LLTEContents::MAX_TES); U8 *cur_ptr = tec.packed_buffer; LL_DEBUGS("TEXTUREENTRY") << "Texture Entry with buffere sized: " << tec.size << LL_ENDL; |