diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-25 17:11:56 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-25 17:11:56 -0500 |
| commit | 8b2b0ba2df1f21490f6cf454a5f62cf5f7b4f833 (patch) | |
| tree | 3fefa4114242238bbc97bd16c506ee9e9e405e07 /indra/llui/tests/llurlentry_stub.cpp | |
| parent | 714ba52df0397b58769e02ae9a7d9877a4505d34 (diff) | |
| parent | 93138ec2cbd5a9707a7ade1acc6ef35fbc50b422 (diff) | |
Automated merge with file:///Users/oz/Work/V-D
Diffstat (limited to 'indra/llui/tests/llurlentry_stub.cpp')
| -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); |