diff options
author | Dave SIMmONs <simon@lindenlab.com> | 2011-04-05 10:36:41 -0700 |
---|---|---|
committer | Dave SIMmONs <simon@lindenlab.com> | 2011-04-05 10:36:41 -0700 |
commit | 37c15d211b55d979ecea78237b22513ee663eb7a (patch) | |
tree | 26fd8866ddc859ad7845d4da056b86ffbc5fdc71 /indra/llui | |
parent | 5e486cf21bf8bcd4a40b44d024a19f8318e596bc (diff) | |
parent | aeac73e45ec6210706dfaee959d8d798c6161c98 (diff) |
Merge
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 c11ad11de9..ac2412c928 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 = const_cast<char*>("AgentData"); -char* _PREHASH_AgentID = const_cast<char*>("AgentID"); +char const* const _PREHASH_AgentData = (char *)"AgentData"; +char const* const _PREHASH_AgentID = (char *)"AgentID"; LLHost LLHost::invalid(INVALID_PORT,INVALID_HOST_IP_ADDRESS); |