summaryrefslogtreecommitdiff
path: root/indra/llmessage/message.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-09-01 18:29:17 -0400
committerNat Goodspeed <nat@lindenlab.com>2016-09-01 18:29:17 -0400
commit3a2383dc0dc33ccbcddd63e3c0083cedb39f0dcd (patch)
tree7cd7cef085a002885a362337fc8b67060bfcc395 /indra/llmessage/message.h
parent31d3d654f156351e3cf29f97fd97cbda046ae650 (diff)
parent959edebeca3c1d9f0730292c2f3bc0e8bb5bf94a (diff)
Automated merge with file:///Users/nat/linden/viewer-comment-lllog
Diffstat (limited to 'indra/llmessage/message.h')
-rw-r--r--indra/llmessage/message.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llmessage/message.h b/indra/llmessage/message.h
index 133db620e6..681de441ce 100644
--- a/indra/llmessage/message.h
+++ b/indra/llmessage/message.h
@@ -60,6 +60,7 @@
#include "llstoredmessage.h"
#include "boost/function.hpp"
+#include "llpounceable.h"
const U32 MESSAGE_MAX_STRINGS_LENGTH = 64;
const U32 MESSAGE_NUMBER_OF_HASH_BUCKETS = 8192;
@@ -832,7 +833,7 @@ private:
// external hook into messaging system
-extern LLMessageSystem *gMessageSystem;
+extern LLPounceable<LLMessageSystem*, LLPounceableStatic> gMessageSystem;
// Must specific overall system version, which is used to determine
// if a patch is available in the message template checksum verification.