diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-01 12:47:19 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-01 12:47:19 -0400 |
| commit | 2f74cd32791dc9025e1e396b2f535fdfb6b1ca87 (patch) | |
| tree | 6d57ab7f0d3ea7717276fca421e98547d52b5124 /indra/llui/tests/llurlentry_stub.cpp | |
| parent | 6bee9532207cfabd1c6315ea00fa7703bc401d2c (diff) | |
| parent | a03f6997d8c3519e2c89930a1ed03a787af6f7ae (diff) | |
merge changes for storm-1130
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 095447ec66..966bea329c 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* _PREHASH_AgentData = (char *)"AgentData"; +char* _PREHASH_AgentID = (char *)"AgentID"; LLHost LLHost::invalid(INVALID_PORT,INVALID_HOST_IP_ADDRESS); |