diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-02-27 20:51:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-27 20:51:04 +0200 |
| commit | 2f362aa1261129014bc0e10c8604be9af8540658 (patch) | |
| tree | 92917183ce9c88e6ed38220514fb5a826fdebb6b /indra/llmessage/message.cpp | |
| parent | ecac92c60c1ca92aae0bb940c8a7952146c99df0 (diff) | |
| parent | b52842ee2a328d80834f9a62c1b130ec757b9a03 (diff) | |
Merge pull request #3583 'faster avatar loading' into release/2025.03
Diffstat (limited to 'indra/llmessage/message.cpp')
| -rw-r--r-- | indra/llmessage/message.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp index cfa5178fc6..c130b7a6db 100644 --- a/indra/llmessage/message.cpp +++ b/indra/llmessage/message.cpp @@ -656,8 +656,7 @@ bool LLMessageSystem::checkMessages(LockMessageChecker&, S64 frame_count ) // UseCircuitCode is allowed in even from an invalid circuit, so that // we can toss circuits around. - if( - valid_packet && + else if ( !cdp && (mTemplateMessageReader->getMessageName() != _PREHASH_UseCircuitCode)) @@ -667,8 +666,7 @@ bool LLMessageSystem::checkMessages(LockMessageChecker&, S64 frame_count ) valid_packet = false; } - if( - valid_packet && + if ( valid_packet && cdp && !cdp->getTrusted() && mTemplateMessageReader->isTrusted()) @@ -680,7 +678,7 @@ bool LLMessageSystem::checkMessages(LockMessageChecker&, S64 frame_count ) valid_packet = false; } - if( valid_packet ) + if ( valid_packet ) { logValidMsg(cdp, host, recv_reliable, recv_resent, acks>0 ); valid_packet = mTemplateMessageReader->readMessage(buffer, host); @@ -821,6 +819,11 @@ void LLMessageSystem::processAcks(LockMessageChecker&, F32 collect_time) } } +S32 LLMessageSystem::drainUdpSocket() +{ + return mPacketRing.drainSocket(mSocket); +} + void LLMessageSystem::copyMessageReceivedToSend() { // NOTE: babbage: switch builder to match reader to avoid |