diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-03 07:20:04 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-03 07:20:04 -0500 |
| commit | 64c07135bab95b5425ddff69351f0c86301def97 (patch) | |
| tree | ff3ed9375340cebcfa34904e5a9a2ee3ba105ee1 /indra/llui/tests | |
| parent | aa72b0df03c1dfea7571eae4abed30ce9f269158 (diff) | |
| parent | 7f00a037ee61de0573f00b33ab637794387b2b64 (diff) | |
merge up from viewer-development
Diffstat (limited to 'indra/llui/tests')
| -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); |