diff options
author | Jacek Antonelli | 2008-10-17 19:06:47 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-10-17 19:07:46 -0500 |
commit | 8f50d81693ff9463ae49c36935977a2b70e6bf45 (patch) | |
tree | c9cfff9baa90394b8a3866c5696c84352f19bba6 /linden/indra/llmessage/llmessagetemplate.h | |
parent | Fixed bad panel_overlay XML from a sloppy merge. (diff) | |
parent | Second Life viewer sources 1.21.6 (diff) | |
download | meta-impy-8f50d81693ff9463ae49c36935977a2b70e6bf45.zip meta-impy-8f50d81693ff9463ae49c36935977a2b70e6bf45.tar.gz meta-impy-8f50d81693ff9463ae49c36935977a2b70e6bf45.tar.bz2 meta-impy-8f50d81693ff9463ae49c36935977a2b70e6bf45.tar.xz |
Updated source to SL version 1.21.6.
Diffstat (limited to 'linden/indra/llmessage/llmessagetemplate.h')
-rw-r--r-- | linden/indra/llmessage/llmessagetemplate.h | 8 |
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 | |||
265 | { | 265 | { |
266 | MD_NOTDEPRECATED, | 266 | MD_NOTDEPRECATED, |
267 | MD_UDPDEPRECATED, | 267 | MD_UDPDEPRECATED, |
268 | MD_UDPBLACKLISTED, | ||
268 | MD_DEPRECATED | 269 | MD_DEPRECATED |
269 | }; | 270 | }; |
270 | 271 | ||
@@ -299,7 +300,7 @@ public: | |||
299 | ~LLMessageTemplate() | 300 | ~LLMessageTemplate() |
300 | { | 301 | { |
301 | for_each(mMemberBlocks.begin(), mMemberBlocks.end(), DeletePointer()); | 302 | for_each(mMemberBlocks.begin(), mMemberBlocks.end(), DeletePointer()); |
302 | } | 303 | } |
303 | 304 | ||
304 | void addBlock(LLMessageBlock *blockp) | 305 | void addBlock(LLMessageBlock *blockp) |
305 | { | 306 | { |
@@ -380,6 +381,11 @@ public: | |||
380 | return trustedSource ? mBanFromTrusted : mBanFromUntrusted; | 381 | return trustedSource ? mBanFromTrusted : mBanFromUntrusted; |
381 | } | 382 | } |
382 | 383 | ||
384 | bool isUdpBanned() const | ||
385 | { | ||
386 | return mDeprecation == MD_UDPBLACKLISTED; | ||
387 | } | ||
388 | |||
383 | friend std::ostream& operator<<(std::ostream& s, LLMessageTemplate &msg); | 389 | friend std::ostream& operator<<(std::ostream& s, LLMessageTemplate &msg); |
384 | 390 | ||
385 | const LLMessageBlock* getBlock(char* name) const | 391 | const LLMessageBlock* getBlock(char* name) const |