diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-31 15:50:34 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-31 15:50:34 -0400 |
| commit | 635a4524fafe754f38432fce2206f8c730df5234 (patch) | |
| tree | 9f35128e70179a25cf086b994d2b4395ff5a2122 /indra/llui/tests/llurlentry_stub.cpp | |
| parent | 5c3ae68299f79f3a705fa4b3e9cd262b56695318 (diff) | |
| parent | 4aad5ee313f580e08f9689b7ff4c4c088c20f831 (diff) | |
pull tags from viewer-development
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); |