summaryrefslogtreecommitdiff
path: root/indra/llui/tests
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2011-02-19 00:17:12 +0000
committerDon Kjer <don@lindenlab.com>2011-02-19 00:17:12 +0000
commit8330a4d0fd046834a27a988102b439a6ec1f0aa2 (patch)
tree7fd2227522bf5c2377a45124cb50aad0afb90597 /indra/llui/tests
parent3f5760b5ee4e422e11f3416133b7a4c3a73b1d8c (diff)
parent18bf5f09b22a2c36ccf543104b1115a7b0b9db71 (diff)
Merge of ssh://hg.lindenlab.com/nat/viewer-eventapi2/
Diffstat (limited to 'indra/llui/tests')
-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 58b27671e8..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 = (char *) "AgentData";
-char* _PREHASH_AgentID = (char *) "AgentID";
+char* _PREHASH_AgentData = const_cast<char*>("AgentData");
+char* _PREHASH_AgentID = const_cast<char*>("AgentID");
LLHost LLHost::invalid(INVALID_PORT,INVALID_HOST_IP_ADDRESS);