diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-06-26 15:27:34 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-06-26 15:27:34 -0400 |
| commit | 3f52cefcc4b4cc00caef56a40e0da1ea981a3073 (patch) | |
| tree | 7697fdea468261e1cd266eed1ba37ecab08c1e16 /indra/llmessage/tests/lltrustedmessageservice_test.cpp | |
| parent | 33c88a1c6037290924691db59c6538a370946ea4 (diff) | |
| parent | 687efd84eabc524e339e61458b0cbf53f9a38f8a (diff) | |
MAINT-5232: merge LLError::Log::demangle() to tip
Diffstat (limited to 'indra/llmessage/tests/lltrustedmessageservice_test.cpp')
| -rwxr-xr-x | 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 100755 --- 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) |