summaryrefslogtreecommitdiff
path: root/indra/llmessage/message.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2015-05-23 12:41:47 -0400
committerNat Goodspeed <nat@lindenlab.com>2015-05-23 12:41:47 -0400
commit430263746424bd0a7c6647d25d9d1db5eca2e8c0 (patch)
treec8f94523e5ebcefa3fc578a76a947f5223c8be56 /indra/llmessage/message.h
parentdf3da846243cce973468b15d1f1752db2009d4ba (diff)
MAINT-5232: Make gMessageSystem an LLPounceable<LLMessageSystem*>.
This will permit other subsystems to use gMessageSystem.callWhenReady() to (e.g.) register callbacks as soon as gMessageSystem is fully initialized.
Diffstat (limited to 'indra/llmessage/message.h')
-rwxr-xr-xindra/llmessage/message.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llmessage/message.h b/indra/llmessage/message.h
index 348b09b992..a6fabf2126 100755
--- a/indra/llmessage/message.h
+++ b/indra/llmessage/message.h
@@ -60,6 +60,7 @@
#include "llmessagesenderinterface.h"
#include "llstoredmessage.h"
+#include "llpounceable.h"
const U32 MESSAGE_MAX_STRINGS_LENGTH = 64;
const U32 MESSAGE_NUMBER_OF_HASH_BUCKETS = 8192;
@@ -830,7 +831,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.