summaryrefslogtreecommitdiff
path: root/indra/llui/tests
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-01 13:31:08 -0400
committerOz Linden <oz@lindenlab.com>2011-04-01 13:31:08 -0400
commit8ceff5afd679d4432bc22532dc1d98f563c0b8e4 (patch)
tree112364b254bc8c1901a9087ed9e357f829fcb353 /indra/llui/tests
parent2f74cd32791dc9025e1e396b2f535fdfb6b1ca87 (diff)
correct merge error in prehash change
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 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);