diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-14 09:50:39 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-14 09:50:39 -0500 |
| commit | 26bcba4c9b77fa63912343d9d4ed64677e59dfd4 (patch) | |
| tree | ca629ca097089ed5a449a548a911bc364fc6052d /indra/llui | |
| parent | e15b543dd655e2b93d9cab1326b389b6b04a7522 (diff) | |
| parent | ee2aebfaf38ca12574b9835340ed8c55c6fbccf2 (diff) | |
merge up to latest 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 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); |