diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-23 15:56:28 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-23 15:56:28 -0500 |
| commit | b246fdd74827caa7927c0aee64397a764db58df2 (patch) | |
| tree | bd76f7ca0d164a219547725d41ce2bd01b5637d6 /indra/llui | |
| parent | 609c70eb5a48389bef1ad33358774764ee9615e2 (diff) | |
| parent | 0a262969e1da82fc95ec889f7aaafa4078bcf480 (diff) | |
Automated merge with ssh://hg@bitbucket.org/lindenlab/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); |