diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2011-02-17 19:28:34 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2011-02-17 19:28:34 -0500 |
| commit | 89258376ffc3d1e6d9e40a9136e4901e643187c8 (patch) | |
| tree | 71955ae12838cb282d48337f5ff37790c4b50612 /indra/llui/tests/llurlentry_stub.cpp | |
| parent | 930710ceecf32c12af5d6e416a4697f9eb9df8aa (diff) | |
| parent | 5946d84eef30caeae6dee63767fabdcf81613984 (diff) | |
Automated merge with http://pdp47.lindenlab.com/cgi-bin/hgwebdir.cgi/brad/viewer-development/
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..c11ad11de9 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 = const_cast<char*>("AgentData"); +char* _PREHASH_AgentID = const_cast<char*>("AgentID"); LLHost LLHost::invalid(INVALID_PORT,INVALID_HOST_IP_ADDRESS); |