Second Life viewer sources 1.22.0-RC

1 files changed, 21 insertions, 1 deletions

diff --git a/linden/indra/llmessage/llmessagetemplate.cpp b/linden/indra/llmessage/llmessagetemplate.cpp
index 4a560ca..ff44d45 100644
--- a/linden/indra/llmessage/llmessagetemplate.cpp
+++ b/linden/indra/llmessage/llmessagetemplate.cpp
@@ -50,7 +50,7 @@ void LLMsgVarData::addData(const void *data, S32 size, EMsgVariableType type, S3
         }
         if(size)
         {
-                delete mData; // Delete it if it already exists
+                delete[] mData; // Delete it if it already exists
                 mData = new U8[size];
                 htonmemcpy(mData, data, mType, size);
         }
@@ -175,3 +175,23 @@ std::ostream& operator<<(std::ostream& s, LLMessageTemplate &msg)
 
         return s;
 }
+
+void LLMessageTemplate::banUdp()
+{
+        static const char* deprecation[] = {
+                "NotDeprecated",
+                "Deprecated",
+                "UDPDeprecated",
+                "UDPBlackListed"
+        };
+        if (mDeprecation != MD_DEPRECATED)
+        {
+                llinfos << "Setting " << mName << " to UDPBlackListed was " << deprecation[mDeprecation] << llendl;
+                mDeprecation = MD_UDPBLACKLISTED;
+        }
+        else
+        {
+                llinfos << mName << " is already more deprecated than UDPBlackListed" << llendl;
+        }
+}
+