diff options
author | Oz Linden <oz@lindenlab.com> | 2011-04-01 09:31:56 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-04-01 09:31:56 -0400 |
commit | 9698314736252b248921bb3a3459f2bdf539ffba (patch) | |
tree | cff4957f66ae90248466a0dccd6e5886dfb62f55 /indra/llui/tests/llurlentry_stub.cpp | |
parent | ed2222be5d33cb4216e6826507ae1d06e9781253 (diff) | |
parent | 2c584790d0505ebff13d29e9f068aefcffe54f01 (diff) |
merge changes for storm-399
Diffstat (limited to 'indra/llui/tests/llurlentry_stub.cpp')
-rw-r--r-- | indra/llui/tests/llurlentry_stub.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/tests/llurlentry_stub.cpp b/indra/llui/tests/llurlentry_stub.cpp index 96ebe83826..095447ec66 100644 --- a/indra/llui/tests/llurlentry_stub.cpp +++ b/indra/llui/tests/llurlentry_stub.cpp @@ -193,8 +193,8 @@ LLFontGL* LLFontGL::getFontDefault() return NULL; } -char* _PREHASH_AgentData = "AgentData"; -char* _PREHASH_AgentID = "AgentID"; +char const* const _PREHASH_AgentData = 0; // never dereferenced during this test +char const* const _PREHASH_AgentID = 0; // never dereferenced during this test LLHost LLHost::invalid(INVALID_PORT,INVALID_HOST_IP_ADDRESS); |