summaryrefslogtreecommitdiff
path: root/indra/llmessage/llmessagetemplate.h
diff options
context:
space:
mode:
authorBaker Linden <baker@lindenlab.com>2013-01-09 15:25:06 -0800
committerBaker Linden <baker@lindenlab.com>2013-01-09 15:25:06 -0800
commitc4a1bd1c2f2e8da202c59d756e5d49b273e5145c (patch)
tree96f3ccbb2c5d534f021052fafab97bedd6d57e91 /indra/llmessage/llmessagetemplate.h
parentb0c449d301299a4ba1b7d83e930f9df6b071b931 (diff)
parentcdd45b9abb35b40f2a31e7433fb99e588df8b40b (diff)
viewer-development merge
Diffstat (limited to 'indra/llmessage/llmessagetemplate.h')
-rw-r--r--indra/llmessage/llmessagetemplate.h3
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;
}