diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2011-02-14 14:45:47 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2011-02-14 14:45:47 -0500 |
| commit | 34ba85dd59f64f481f6bc6de0fd9fabf681c7096 (patch) | |
| tree | 009c957b5d6159a04f2256d88522d7ca7fe19c7c /indra/llui/tests/llurlentry_stub.cpp | |
| parent | e15b543dd655e2b93d9cab1326b389b6b04a7522 (diff) | |
| parent | dad558250f645ef9d2eea88e0ad18a54ad0402ee (diff) | |
Automated merge with http://hg.secondlife.com/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); |