diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-01 09:23:27 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-01 09:23:27 -0400 |
| commit | 8bc829220f8fc99180a1b1917220576a59de7339 (patch) | |
| tree | 626ee852038ef0729fe86e521f3719f94c94ce44 /indra/llui/tests/llurlentry_stub.cpp | |
| parent | ed2222be5d33cb4216e6826507ae1d06e9781253 (diff) | |
| parent | 635a4524fafe754f38432fce2206f8c730df5234 (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..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* _PREHASH_AgentData = "AgentData"; -char* _PREHASH_AgentID = "AgentID"; +char* _PREHASH_AgentData = (char *)"AgentData"; +char* _PREHASH_AgentID = (char *)"AgentID"; LLHost LLHost::invalid(INVALID_PORT,INVALID_HOST_IP_ADDRESS); |