diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-05-26 20:15:42 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-05-26 20:15:42 -0400 |
| commit | df55db4aa02ef02169d318b1d8b607c2edb3ba5d (patch) | |
| tree | c8d586ca1ab4b54d0b1a65338a79fae59222fc18 /indra/llui/tests | |
| parent | f3c58f765c0168f25bb13c4427e34b4bdad2f671 (diff) | |
| parent | 234ea528505d0363c4c4eb0150e7587e863c8e20 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llui/tests')
| -rwxr-xr-x | indra/llui/tests/llurlentry_stub.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/tests/llurlentry_stub.cpp b/indra/llui/tests/llurlentry_stub.cpp index 5d3f9ac327..d28f601009 100755 --- a/indra/llui/tests/llurlentry_stub.cpp +++ b/indra/llui/tests/llurlentry_stub.cpp @@ -31,6 +31,7 @@ #include "llcachename.h" #include "lluuid.h" #include "message.h" +#include "llpounceable.h" #include <string> @@ -167,7 +168,7 @@ char const* const _PREHASH_AgentID = (char *)"AgentID"; LLHost LLHost::invalid(INVALID_PORT,INVALID_HOST_IP_ADDRESS); -LLMessageSystem* gMessageSystem = NULL; +LLPounceable<LLMessageSystem*, LLPounceableStatic> gMessageSystem; // // Stub implementation for LLMessageSystem |