summaryrefslogtreecommitdiff
path: root/indra/newview/tests
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-03 09:37:03 -0400
committerOz Linden <oz@lindenlab.com>2011-04-03 09:37:03 -0400
commitb8e97adced58f81a52e6b76a14309d275d55c8bc (patch)
tree9f2710cbb13093c509896f184a025ab7469c934c /indra/newview/tests
parentabc259618f06f69ba8e7c72cb149bcddc1bb6ddf (diff)
parente58c809a5816383674d0f1957440fad728e88893 (diff)
merge changes for OPEN-39
Diffstat (limited to 'indra/newview/tests')
-rw-r--r--indra/newview/tests/llremoteparcelrequest_test.cpp4
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() { }