diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-11-14 22:04:37 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-11-14 22:04:37 +0200 |
| commit | 7fceb3a63f0157c7075c77e6d8516079ff4d217a (patch) | |
| tree | 19f23fe6dc1c2d396de32b32608352091ebda332 /indra/newview/tests/llremoteparcelrequest_test.cpp | |
| parent | 6c7fabdec76eda60fa27640d115e06e2bbfc12e4 (diff) | |
| parent | c52f621e20737b553a9a9e7f1c961f5d5fbc6f89 (diff) | |
Merged in lindenlab/viewer-cleanup
Diffstat (limited to 'indra/newview/tests/llremoteparcelrequest_test.cpp')
| -rw-r--r-- | 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 ea5014a59c..4f7f87b6b0 100644 --- a/indra/newview/tests/llremoteparcelrequest_test.cpp +++ b/indra/newview/tests/llremoteparcelrequest_test.cpp @@ -34,6 +34,7 @@ #include "../llagent.h" #include "message.h" #include "llurlentry.h" +#include "llpounceable.h" namespace { const LLUUID TEST_PARCEL_ID("11111111-1111-1111-1111-111111111111"); @@ -62,7 +63,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; |