diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-27 12:27:05 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-27 12:27:05 -0400 |
commit | a3d89650a9a485902982ac066b2a4e9cf642989d (patch) | |
tree | da1723ade50571e7fe1fe15e43a1b9cb595b5ae5 /indra/newview/tests/llremoteparcelrequest_test.cpp | |
parent | 71f5c1f5e8bbf6b22776cd7f98aabecc7a48918d (diff) | |
parent | 154a465bdaff58023c43bed12b4a049ae72a55df (diff) |
merged .hgtags from viewer-pre-release
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() { } |