summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2011-04-01 23:37:30 +0000
committerDon Kjer <don@lindenlab.com>2011-04-01 23:37:30 +0000
commitd292053c04e6adfd48be0484dd5a8a07b48e0541 (patch)
treebb8814069df178e2bcae041f2c3e9b11338492db /indra/llui
parentf2bb81d17660054697ed984afc0e3f8d90f77eda (diff)
parent1664c9dc678f7aca9c2bbf38d28e00550e03c4dd (diff)
Merge with viewer-development
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/tests/llurlentry_stub.cpp4
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);