summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2017-06-14 20:31:02 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2017-06-14 20:31:02 +0300
commita693fd391a5a1756e78a9ec3dc4002069149a4f4 (patch)
tree09292aaf96a89a80926dd416e269a350d76994fb
parentc2363c3ae95c38a6ed175375d5af638d64acef22 (diff)
parent21f22ced4ddf10afcbe0fae299a24b3ceb01d1de (diff)
Merged in lindenlab/viewer-lynx
-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);
}