diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:39:31 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:39:31 -0400 |
| commit | 60bceb759b592348b403689ffa8ed9c768126f8b (patch) | |
| tree | 33b0ece80cc12f390683d89c30f2a706fa87bd50 /indra/newview/tests/llremoteparcelrequest_test.cpp | |
| parent | c9c192e2c476e73807d23cdda0814cb221a96b95 (diff) | |
| parent | e2baffa940a5797f2055f13ceb9722de524b2ec3 (diff) | |
merge changes for storm-954
Diffstat (limited to 'indra/newview/tests/llremoteparcelrequest_test.cpp')
| -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() { } |