Merge branch 'merge-1.21.6' into rebranding

Conflicts:
	linden/indra/newview/installers/windows/installer_template.nsi
	linden/indra/newview/llappviewer.cpp

1 files changed, 4 insertions, 0 deletions

diff --git a/linden/indra/llmessage/llmessagetemplateparser.cpp b/linden/indra/llmessage/llmessagetemplateparser.cpp
index d6adba8..9f6eeca 100644
--- a/linden/indra/llmessage/llmessagetemplateparser.cpp
+++ b/linden/indra/llmessage/llmessagetemplateparser.cpp
@@ -525,6 +525,10 @@ LLMessageTemplate * LLTemplateParser::parseMessage(LLTemplateTokenizer & tokens)
         {
                 templatep->setDeprecation(MD_UDPDEPRECATED);
         }
+        else if (tokens.want("UDPBlackListed"))
+        {
+                templatep->setDeprecation(MD_UDPBLACKLISTED);
+        }
         else if (tokens.want("NotDeprecated"))
         {
                 // this is the default value, but it can't hurt to set it twice