diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-19 06:32:13 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-19 06:32:13 -0400 |
| commit | 5a1b27ba5fbaaa9ee5528b1023a294bc899f7768 (patch) | |
| tree | c641bd45e6384c85bff5e43ab01af5cad784283b /indra/llui | |
| parent | 1a7369408c0b2cd15dbdc79d045f3347a8ab47d1 (diff) | |
| parent | 9693227cb41f909ef66f86e6699ad0bf124a7e83 (diff) | |
merge out latest 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); |