diff options
author | Oz Linden <oz@lindenlab.com> | 2011-04-01 17:39:08 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-04-01 17:39:08 -0400 |
commit | 1664c9dc678f7aca9c2bbf38d28e00550e03c4dd (patch) | |
tree | 9a51b54cd3a500e066c25e2c6180dd343ec639d9 /indra/llui | |
parent | 2deea7c9d162b9bcae29e73fca8eebd26460fbf8 (diff) | |
parent | f12d79907c7f002666291ab23dbb01ba715fa2c1 (diff) |
merge out end-of-develop.py tag from viewer-development
Diffstat (limited to 'indra/llui')
-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 095447ec66..ac2412c928 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 const* const _PREHASH_AgentData = 0; // never dereferenced during this test -char const* const _PREHASH_AgentID = 0; // never dereferenced during this test +char const* const _PREHASH_AgentData = (char *)"AgentData"; +char const* const _PREHASH_AgentID = (char *)"AgentID"; LLHost LLHost::invalid(INVALID_PORT,INVALID_HOST_IP_ADDRESS); |