diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-11-02 14:09:43 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-11-02 14:09:43 -0500 |
| commit | 11c428759e0b99fc34e219181d81d024b0323b4d (patch) | |
| tree | e6ee27fa90d7767ac8f959c97474ee34bab00211 /indra/llui/tests | |
| parent | 84150294b912d04e345007b65670c0230a2e4d79 (diff) | |
| parent | 77da469d6f7901ee0cddf5fb351cd2a756b217f0 (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 |