diff options
Diffstat (limited to 'linden/indra/llmessage/llmessagetemplate.h')
-rw-r--r-- | linden/indra/llmessage/llmessagetemplate.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/linden/indra/llmessage/llmessagetemplate.h b/linden/indra/llmessage/llmessagetemplate.h index 716c618..445d1a8 100644 --- a/linden/indra/llmessage/llmessagetemplate.h +++ b/linden/indra/llmessage/llmessagetemplate.h | |||
@@ -34,6 +34,7 @@ | |||
34 | 34 | ||
35 | #include "lldarray.h" | 35 | #include "lldarray.h" |
36 | #include "message.h" // TODO: babbage: Remove... | 36 | #include "message.h" // TODO: babbage: Remove... |
37 | #include "llstat.h" | ||
37 | #include "llstl.h" | 38 | #include "llstl.h" |
38 | 39 | ||
39 | class LLMsgVarData | 40 | class LLMsgVarData |
@@ -370,20 +371,23 @@ public: | |||
370 | { | 371 | { |
371 | if (mHandlerFunc) | 372 | if (mHandlerFunc) |
372 | { | 373 | { |
374 | LLPerfBlock msg_cb_time("msg_cb", mName); | ||
373 | mHandlerFunc(msgsystem, mUserData); | 375 | mHandlerFunc(msgsystem, mUserData); |
374 | return TRUE; | 376 | return TRUE; |
375 | } | 377 | } |
376 | return FALSE; | 378 | return FALSE; |
377 | } | 379 | } |
378 | 380 | ||
379 | bool isBanned(bool trustedSource) const | 381 | bool isUdpBanned() const |
380 | { | 382 | { |
381 | return trustedSource ? mBanFromTrusted : mBanFromUntrusted; | 383 | return mDeprecation == MD_UDPBLACKLISTED; |
382 | } | 384 | } |
383 | 385 | ||
384 | bool isUdpBanned() const | 386 | void banUdp(); |
387 | |||
388 | bool isBanned(bool trustedSource) const | ||
385 | { | 389 | { |
386 | return mDeprecation == MD_UDPBLACKLISTED; | 390 | return trustedSource ? mBanFromTrusted : mBanFromUntrusted; |
387 | } | 391 | } |
388 | 392 | ||
389 | friend std::ostream& operator<<(std::ostream& s, LLMessageTemplate &msg); | 393 | friend std::ostream& operator<<(std::ostream& s, LLMessageTemplate &msg); |