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, 7 insertions, 1 deletions

diff --git a/linden/indra/llmessage/llmessagetemplate.h b/linden/indra/llmessage/llmessagetemplate.h
index f92c4b7..716c618 100644
--- a/linden/indra/llmessage/llmessagetemplate.h
+++ b/linden/indra/llmessage/llmessagetemplate.h
@@ -265,6 +265,7 @@ enum EMsgDeprecation
 {
         MD_NOTDEPRECATED,
         MD_UDPDEPRECATED,
+        MD_UDPBLACKLISTED,
         MD_DEPRECATED
 };
 
@@ -299,7 +300,7 @@ public:
         ~LLMessageTemplate()
         {
                 for_each(mMemberBlocks.begin(), mMemberBlocks.end(), DeletePointer());
-}
+        }
 
         void addBlock(LLMessageBlock *blockp)
         {
@@ -380,6 +381,11 @@ public:
                 return trustedSource ? mBanFromTrusted : mBanFromUntrusted;
         }
 
+        bool isUdpBanned() const
+        {
+                return mDeprecation == MD_UDPBLACKLISTED;
+        }
+
         friend std::ostream&     operator<<(std::ostream& s, LLMessageTemplate &msg);
 
         const LLMessageBlock* getBlock(char* name) const