diff options
| author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2013-01-30 15:25:09 -0800 |
|---|---|---|
| committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2013-01-30 15:25:09 -0800 |
| commit | ee87ef23037f5e2904dfea3da061a9548cc113f5 (patch) | |
| tree | d3aaa5405c97866529e2029572d81ebbd90b8d4a /indra/llmessage/llmessagetemplate.h | |
| parent | 07b557cef909d74cd514b2d7e6b666edbfae3ef2 (diff) | |
| parent | 60d1404b212824939b8bcd17fd2cc1e46e9bac55 (diff) | |
merge downstream code from viewer-lion
Diffstat (limited to 'indra/llmessage/llmessagetemplate.h')
| -rw-r--r-- | indra/llmessage/llmessagetemplate.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llmessage/llmessagetemplate.h b/indra/llmessage/llmessagetemplate.h index 16d825d33b..ae8e0087c1 100644 --- a/indra/llmessage/llmessagetemplate.h +++ b/indra/llmessage/llmessagetemplate.h @@ -29,7 +29,6 @@ #include "lldarray.h" #include "message.h" // TODO: babbage: Remove... -#include "llstat.h" #include "llstl.h" class LLMsgVarData @@ -263,6 +262,7 @@ enum EMsgDeprecation MD_DEPRECATED }; + class LLMessageTemplate { public: @@ -364,7 +364,6 @@ public: { if (mHandlerFunc) { - LLPerfBlock msg_cb_time("msg_cb", mName); mHandlerFunc(msgsystem, mUserData); return TRUE; } |