summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2017-06-14 14:49:28 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2017-06-14 14:49:28 +0100
commit21f22ced4ddf10afcbe0fae299a24b3ceb01d1de (patch)
tree629fb20dd0f950b472bfac2e81491a1003318b1a
parent52a964376b6aabd1abadfb7329004c2e58b7b97a (diff)
parent99b203d4e8e0ec530d0ee8b0627e5fa3cf0c59db (diff)
merge
-rw-r--r--indra/llmessage/lltemplatemessagereader.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llmessage/lltemplatemessagereader.cpp b/indra/llmessage/lltemplatemessagereader.cpp
index 406afadd2f..4e0c53c37e 100644
--- a/indra/llmessage/lltemplatemessagereader.cpp
+++ b/indra/llmessage/lltemplatemessagereader.cpp
@@ -499,9 +499,10 @@ BOOL LLTemplateMessageReader::decodeTemplate(
}
else
{
- LL_WARNS() << "Message #" << std::hex << num << std::dec
- << " received but not registered!" << LL_ENDL;
- gMessageSystem->callExceptionFunc(MX_UNREGISTERED_MESSAGE);
+ // MAINT-7482 - make viewer more tolerant of unknown messages.
+ LL_WARNS_ONCE() << "Message #" << std::hex << num << std::dec
+ << " received but not registered!" << LL_ENDL;
+ //gMessageSystem->callExceptionFunc(MX_UNREGISTERED_MESSAGE);
return(FALSE);
}