summaryrefslogtreecommitdiff
path: root/indra/llui/tests
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-08 09:21:55 -0400
committerOz Linden <oz@lindenlab.com>2011-04-08 09:21:55 -0400
commitc492bffaa6cd0d9bb05bbc3671c7658b7ba52862 (patch)
tree9bf24f8e6ae1207aef0cae78ae62f5509e5074e6 /indra/llui/tests
parent3ffc5dc09c186fe0ac57ac66b33bfc105ca01363 (diff)
parent52615d251bc9261fe5765feefbcd31021bd75934 (diff)
pull tags back from viewer-release
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 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);