diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2016-09-01 19:52:45 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2016-09-01 19:52:45 -0400 |
commit | a1741be7f6e4d67be55d6a5bc628c38390f9d4b4 (patch) | |
tree | 5c02bd701c5e55cfcf9fbe8af34cb2ae4b2c9995 /indra/llmessage/message.h | |
parent | 9be4e7e448769cb82dc7d82e93bee4f1cd2b3e6c (diff) | |
parent | 3a2383dc0dc33ccbcddd63e3c0083cedb39f0dcd (diff) |
Automated merge with file:///Users/nat/linden/viewer-comment-lllog
Diffstat (limited to 'indra/llmessage/message.h')
-rw-r--r-- | indra/llmessage/message.h | 3 |
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. |