diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-20 07:36:16 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-20 07:36:16 -0400 |
| commit | 1e34cd77f7858f0a79d82d405be76837aa2af04e (patch) | |
| tree | 40530bc9ab88fca0fcee1c4bce02d2020a1a6b1e /indra/llui | |
| parent | f122d0939060fd597820a71d85a5c0d839bcff5d (diff) | |
| parent | 6d3cf2bba29d3134b4ec151df3a8ca92e3506c6b (diff) | |
pull STORM-1089 beta fixes to autobuild2010 branch
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); |