diff options
author | Mark Palange <palange@lindenlab.com> | 2008-10-07 22:49:00 +0000 |
---|---|---|
committer | Mark Palange <palange@lindenlab.com> | 2008-10-07 22:49:00 +0000 |
commit | 4296542cd062af425d7744c88d6dd2bd00daf532 (patch) | |
tree | 8926d4f0bfaa9ed672f4cf90577afcf8e7f44a97 /indra/llmessage/llmessagetemplate.h | |
parent | c9be97fdfcc6a4c6b23a8c90916af54a38d60ab0 (diff) |
Roll back of r98854 Accidentally commited merge in progress
Diffstat (limited to 'indra/llmessage/llmessagetemplate.h')
-rw-r--r-- | indra/llmessage/llmessagetemplate.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/llmessage/llmessagetemplate.h b/indra/llmessage/llmessagetemplate.h index db8252270a..82421b1f5a 100644 --- a/indra/llmessage/llmessagetemplate.h +++ b/indra/llmessage/llmessagetemplate.h @@ -300,7 +300,7 @@ public: ~LLMessageTemplate() { for_each(mMemberBlocks.begin(), mMemberBlocks.end(), DeletePointer()); - } +} void addBlock(LLMessageBlock *blockp) { @@ -388,11 +388,6 @@ 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 |