diff options
author | Dave SIMmONs <simon@lindenlab.com> | 2011-05-02 09:05:56 -0700 |
---|---|---|
committer | Dave SIMmONs <simon@lindenlab.com> | 2011-05-02 09:05:56 -0700 |
commit | f393774caf49313f24d33cb2b33b6ad92c70977f (patch) | |
tree | ebdaf44b4c3152362f3e9b18c227bd09d39031d5 /indra/newview/tests | |
parent | 31e16be0daa10e6d66b133c308130524a7a0d881 (diff) | |
parent | b9bb792c478d703c6442351ecb563c0a67f77111 (diff) |
Merge from lindenlab/viewer-development
Diffstat (limited to 'indra/newview/tests')
-rw-r--r-- | indra/newview/tests/llremoteparcelrequest_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/tests/llremoteparcelrequest_test.cpp b/indra/newview/tests/llremoteparcelrequest_test.cpp index 7862cce3a1..9a6e08ee84 100644 --- a/indra/newview/tests/llremoteparcelrequest_test.cpp +++ b/indra/newview/tests/llremoteparcelrequest_test.cpp @@ -61,8 +61,8 @@ void LLMessageSystem::addUUIDFast(char const *,LLUUID const &) { } void LLMessageSystem::nextBlockFast(char const *) { } void LLMessageSystem::newMessage(char const *) { } LLMessageSystem * gMessageSystem; -char * _PREHASH_AgentID; -char * _PREHASH_AgentData; +char const* const _PREHASH_AgentID = 0; // never dereferenced during this test +char const* const _PREHASH_AgentData = 0; // never dereferenced during this test LLAgent gAgent; LLAgent::LLAgent() : mAgentAccess(s_saved_settings) { } LLAgent::~LLAgent() { } |