summaryrefslogtreecommitdiff
path: root/indra/llmessage/message.cpp
diff options
context:
space:
mode:
authorMark Palange <palange@lindenlab.com>2008-10-07 22:49:00 +0000
committerMark Palange <palange@lindenlab.com>2008-10-07 22:49:00 +0000
commit4296542cd062af425d7744c88d6dd2bd00daf532 (patch)
tree8926d4f0bfaa9ed672f4cf90577afcf8e7f44a97 /indra/llmessage/message.cpp
parentc9be97fdfcc6a4c6b23a8c90916af54a38d60ab0 (diff)
Roll back of r98854 Accidentally commited merge in progress
Diffstat (limited to 'indra/llmessage/message.cpp')
-rw-r--r--indra/llmessage/message.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp
index 08bed857ce..abd9467602 100644
--- a/indra/llmessage/message.cpp
+++ b/indra/llmessage/message.cpp
@@ -754,7 +754,6 @@ BOOL LLMessageSystem::checkMessages( S64 frame_count )
clearReceiveState();
valid_packet = FALSE;
}
-
if( valid_packet && mTemplateMessageReader->isUdpBanned())
{
llwarns << "Received UDP black listed message "
@@ -767,6 +766,7 @@ 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);
}