diff options
author | Mark Palange <palange@lindenlab.com> | 2008-10-07 22:43:15 +0000 |
---|---|---|
committer | Mark Palange <palange@lindenlab.com> | 2008-10-07 22:43:15 +0000 |
commit | c9be97fdfcc6a4c6b23a8c90916af54a38d60ab0 (patch) | |
tree | b0a7c83b643aff7a50208c3acd5caa4a9df1bbe2 /indra/llmessage/message.cpp | |
parent | 9d7c56bf16f6c093c7b8d486f943e8d6df4d6a24 (diff) |
merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes) merge to trunk
Diffstat (limited to 'indra/llmessage/message.cpp')
-rw-r--r-- | indra/llmessage/message.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp index abd9467602..08bed857ce 100644 --- a/indra/llmessage/message.cpp +++ b/indra/llmessage/message.cpp @@ -754,6 +754,7 @@ BOOL LLMessageSystem::checkMessages( S64 frame_count ) clearReceiveState(); valid_packet = FALSE; } + if( valid_packet && mTemplateMessageReader->isUdpBanned()) { llwarns << "Received UDP black listed message " @@ -766,7 +767,6 @@ BOOL LLMessageSystem::checkMessages( S64 frame_count ) if( valid_packet ) { logValidMsg(cdp, host, recv_reliable, recv_resent, (BOOL)(acks>0) ); - valid_packet = mTemplateMessageReader->readMessage(buffer, host); } |