correct merge error in prehash change

meow-7.2.2
Oz Linden 2011-04-01 13:31:08 -04:00
parent 2f74cd3279
commit 8ceff5afd6
1 changed files with 2 additions and 2 deletions

View File

@ -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);