diff options
| author | James Cook <james@lindenlab.com> | 2007-01-19 00:39:03 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2007-01-19 00:39:03 +0000 |
| commit | 47576ad1f77ecbe606fa1bd3addac610fad43dd7 (patch) | |
| tree | b3d4b30757e3d7479eafa5fbadb9c678ee18cfba /indra | |
| parent | 2d96460462f8b50318510b1e59cf63de5fdfd144 (diff) | |
SL-32769 Scripts now reliably register to receive email on region startup, we establish trust between dataserver and simulator explicitly on startup, reviewed by Kelly.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llmessage/message.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp index 73cda52fa0..f849e989b4 100644 --- a/indra/llmessage/message.cpp +++ b/indra/llmessage/message.cpp @@ -3232,10 +3232,16 @@ void LLMessageSystem::logMsgFromInvalidCircuit( const LLHost& host, BOOL recv_re void LLMessageSystem::logTrustedMsgFromUntrustedCircuit( const LLHost& host ) { - llwarns << "Recieved trusted message on untrusted circuit. " - << "Will reply with deny. " - << "Message: " << mCurrentRMessageTemplate->mName - << " Host: " << host << llendl; + // RequestTrustedCircuit is how we establish trust, so don't spam + // if it's received on a trusted circuit. JC + if (strcmp(mCurrentRMessageTemplate->mName, "RequestTrustedCircuit")) + { + llwarns << "Received trusted message on untrusted circuit. " + << "Will reply with deny. " + << "Message: " << mCurrentRMessageTemplate->mName + << " Host: " << host << llendl; + } + if (mNumMessageCounts >= MAX_MESSAGE_COUNT_NUM) { llwarns << "got more than " << MAX_MESSAGE_COUNT_NUM |