diff options
| author | Alain Linden <alain@lindenlab.com> | 2011-03-03 10:38:39 -0800 |
|---|---|---|
| committer | Alain Linden <alain@lindenlab.com> | 2011-03-03 10:38:39 -0800 |
| commit | 8dffedb246dd5fdf89aadded14630a5e8691b30c (patch) | |
| tree | 34170953d7202fe61bf7c4319e0215d233722ad2 /indra/llui | |
| parent | aa72b0df03c1dfea7571eae4abed30ce9f269158 (diff) | |
| parent | fa20a6de086febf0b6b098172685c26f939876f6 (diff) | |
merge from 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); |