summaryrefslogtreecommitdiff
path: root/indra/llui/tests
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-04-27 12:27:05 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-04-27 12:27:05 -0400
commita3d89650a9a485902982ac066b2a4e9cf642989d (patch)
treeda1723ade50571e7fe1fe15e43a1b9cb595b5ae5 /indra/llui/tests
parent71f5c1f5e8bbf6b22776cd7f98aabecc7a48918d (diff)
parent154a465bdaff58023c43bed12b4a049ae72a55df (diff)
merged .hgtags from viewer-pre-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);