diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2016-09-16 11:04:12 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2016-09-16 11:04:12 -0400 |
| commit | 099e3b41668a8c951cf74ec585ed4192bab507db (patch) | |
| tree | 5481b7cbb15e5674d552fb063227c1277bcdb78b /indra/newview/tests | |
| parent | 51bb369a39142ff5049f753099f9638ce68b95dc (diff) | |
| parent | d2c3c2f9fe197b1856e9a8ed37aeb56b77e2ff07 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/tests')
| -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; |