diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-11 17:40:31 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-11 17:40:31 -0500 |
| commit | 4223ab9acf282f52aac2bcf124f4b2912c2fe88e (patch) | |
| tree | 59e9b446712b5754e55ae7027cf0526b2d2b2c6d /indra/llui | |
| parent | 1426765e82549ec9d17a0f90d902f25c0e785bbd (diff) | |
| parent | 5048942dbc0a0aa577625bc47d77162cbcf1afdc (diff) | |
sync up to 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); |