diff options
| author | Don Kjer <don@lindenlab.com> | 2011-04-01 23:37:30 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-04-01 23:37:30 +0000 |
| commit | d292053c04e6adfd48be0484dd5a8a07b48e0541 (patch) | |
| tree | bb8814069df178e2bcae041f2c3e9b11338492db /indra/newview/tests | |
| parent | f2bb81d17660054697ed984afc0e3f8d90f77eda (diff) | |
| parent | 1664c9dc678f7aca9c2bbf38d28e00550e03c4dd (diff) | |
Merge with 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() { } |