diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-14 16:54:02 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-14 16:54:02 -0400 |
| commit | e119b26f03377b32988456d3fc4ed9605649c191 (patch) | |
| tree | 4d8043344bd5a276a0fcdc26eac07ef3c3d51c77 /indra/llui | |
| parent | 95fcff557f19712e23410a07751f2b571fead8a9 (diff) | |
| parent | 647a270ee22ab38044013c8098babc20b9287ec7 (diff) | |
merged tip of viewer-beta at changeset 9de6fc07304f
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..ac2412c928 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 const* const _PREHASH_AgentData = (char *)"AgentData"; +char const* const _PREHASH_AgentID = (char *)"AgentID"; LLHost LLHost::invalid(INVALID_PORT,INVALID_HOST_IP_ADDRESS); |