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/newview/tests | |
| parent | 33c88a1c6037290924691db59c6538a370946ea4 (diff) | |
| parent | 687efd84eabc524e339e61458b0cbf53f9a38f8a (diff) | |
MAINT-5232: merge LLError::Log::demangle() to tip
Diffstat (limited to 'indra/newview/tests')
| -rwxr-xr-x | indra/newview/tests/llremoteparcelrequest_test.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/tests/llremoteparcelrequest_test.cpp b/indra/newview/tests/llremoteparcelrequest_test.cpp index c49b0350e9..5e3649fdae 100755 --- a/indra/newview/tests/llremoteparcelrequest_test.cpp +++ b/indra/newview/tests/llremoteparcelrequest_test.cpp @@ -33,6 +33,7 @@ #include "../llagent.h" #include "message.h" #include "llurlentry.h" +#include "llpounceable.h" namespace { const LLUUID TEST_PARCEL_ID("11111111-1111-1111-1111-111111111111"); @@ -61,7 +62,7 @@ void LLMessageSystem::addUUID(char const *,LLUUID const &) { } void LLMessageSystem::addUUIDFast(char const *,LLUUID const &) { } void LLMessageSystem::nextBlockFast(char const *) { } void LLMessageSystem::newMessage(char const *) { } -LLMessageSystem * gMessageSystem; +LLPounceable<LLMessageSystem*, LLPounceableStatic> gMessageSystem; char const* const _PREHASH_AgentID = 0; // never dereferenced during this test char const* const _PREHASH_AgentData = 0; // never dereferenced during this test LLAgent gAgent; |