diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-06-30 14:50:37 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-06-30 14:50:37 -0400 |
| commit | 77da469d6f7901ee0cddf5fb351cd2a756b217f0 (patch) | |
| tree | e0d7326fc438f7b579e3ddbcbb4772afa5402d23 /indra/llmessage/message.h | |
| parent | 4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff) | |
| parent | d4fb82c217bccda536f7a7b2ca1809bb8c2dba40 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llmessage/message.h')
| -rwxr-xr-x | 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 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. |