diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-17 15:15:06 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-17 15:15:06 -0500 |
| commit | 0a262969e1da82fc95ec889f7aaafa4078bcf480 (patch) | |
| tree | 7d76da988c79d3b11fc2fc5e51d5f2c0248abaf0 /indra/llui | |
| parent | 1a79aeca54db6ee5bf1fb2968c2642f8a3306091 (diff) | |
| parent | c1901890576d3b9442846c8890b1724438eab46e (diff) | |
Automated merge with file:///Users/oz/Work/V-DR
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); |