summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-01 14:18:24 -0400
committerOz Linden <oz@lindenlab.com>2011-04-01 14:18:24 -0400
commitf12d79907c7f002666291ab23dbb01ba715fa2c1 (patch)
treeca24c6c3d3ab368589208accaae9582173a4cf4a /indra/llui
parent9f4edab4dd93753d2f51e9776d758d5918992c08 (diff)
parent8ceff5afd679d4432bc22532dc1d98f563c0b8e4 (diff)
pull latest changes from viewer-autobuild2010
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 966bea329c..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 = (char *)"AgentData";
-char* _PREHASH_AgentID = (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);