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/tests/lltrustedmessageservice_test.cpp | |
| parent | 9be4e7e448769cb82dc7d82e93bee4f1cd2b3e6c (diff) | |
| parent | 3a2383dc0dc33ccbcddd63e3c0083cedb39f0dcd (diff) | |
Automated merge with file:///Users/nat/linden/viewer-comment-lllog
Diffstat (limited to 'indra/llmessage/tests/lltrustedmessageservice_test.cpp')
| -rw-r--r-- | indra/llmessage/tests/lltrustedmessageservice_test.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llmessage/tests/lltrustedmessageservice_test.cpp b/indra/llmessage/tests/lltrustedmessageservice_test.cpp index 55748ad27e..41f982a7e2 100644 --- a/indra/llmessage/tests/lltrustedmessageservice_test.cpp +++ b/indra/llmessage/tests/lltrustedmessageservice_test.cpp @@ -33,8 +33,9 @@ #include "message.h" #include "llmessageconfig.h" #include "llhttpnode_stub.cpp" +#include "llpounceable.h" -LLMessageSystem* gMessageSystem = NULL; +LLPounceable<LLMessageSystem*, LLPounceableStatic> gMessageSystem; LLMessageConfig::SenderTrust LLMessageConfig::getSenderTrustedness(const std::string& msg_name) |