merge

21f22ced · Brad Payne (Vir Linden) · 52a96437 · 99b203d4 · 21f22ced
Commit 21f22ced authored 7 years ago by Brad Payne (Vir Linden)
--- 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
+        // MAINT-7482 - make viewer more tolerant of unknown messages.
-			<< " received but not registered!" << LL_ENDL;
+		LL_WARNS_ONCE() << "Message #" << std::hex << num << std::dec
-		gMessageSystem->callExceptionFunc(MX_UNREGISTERED_MESSAGE);
+                        << " received but not registered!" << LL_ENDL;
+		//gMessageSystem->callExceptionFunc(MX_UNREGISTERED_MESSAGE);
 		return(FALSE);
 	}