summaryrefslogtreecommitdiff
path: root/indra/llui/tests/llurlentry_stub.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-08 17:34:49 -0400
committerOz Linden <oz@lindenlab.com>2011-04-08 17:34:49 -0400
commit51b75b883269a0a78a9428a690324c17abf028c1 (patch)
tree56e131516119cf7c6fef2219ca8b8b454ceab0c0 /indra/llui/tests/llurlentry_stub.cpp
parentc4ec708922ad5d4a5844b90b8042a939a34733ac (diff)
parentdf329d14a9b882f1bc9c2c598043569ca2688c03 (diff)
merge changes for storm-1108
Diffstat (limited to 'indra/llui/tests/llurlentry_stub.cpp')
-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 96ebe83826..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 = "AgentData";
-char* _PREHASH_AgentID = "AgentID";
+char const* const _PREHASH_AgentData = (char *)"AgentData";
+char const* const _PREHASH_AgentID = (char *)"AgentID";
LLHost LLHost::invalid(INVALID_PORT,INVALID_HOST_IP_ADDRESS);