Skip to content
Snippets Groups Projects
Commit f12d7990 authored by Oz Linden's avatar Oz Linden
Browse files

pull latest changes from viewer-autobuild2010

parents 9f4edab4 8ceff5af
No related branches found
No related tags found
No related merge requests found
...@@ -193,8 +193,8 @@ LLFontGL* LLFontGL::getFontDefault() ...@@ -193,8 +193,8 @@ LLFontGL* LLFontGL::getFontDefault()
return NULL; return NULL;
} }
char* _PREHASH_AgentData = (char *)"AgentData"; char const* const _PREHASH_AgentData = (char *)"AgentData";
char* _PREHASH_AgentID = (char *)"AgentID"; char const* const _PREHASH_AgentID = (char *)"AgentID";
LLHost LLHost::invalid(INVALID_PORT,INVALID_HOST_IP_ADDRESS); LLHost LLHost::invalid(INVALID_PORT,INVALID_HOST_IP_ADDRESS);
......
...@@ -223,7 +223,8 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data) ...@@ -223,7 +223,8 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
columns[3]["value"] = llformat("<%0.1f,%0.1f,%0.1f>", location_x, location_y, location_z); columns[3]["value"] = llformat("<%0.1f,%0.1f,%0.1f>", location_x, location_y, location_z);
columns[3]["font"] = "SANSSERIF"; columns[3]["font"] = "SANSSERIF";
columns[4]["column"] = "time"; columns[4]["column"] = "time";
columns[4]["value"] = formatted_time((time_t)time_stamp); columns[4]["type"] = "date";
columns[4]["value"] = LLDate((time_t)time_stamp);
columns[4]["font"] = "SANSSERIF"; columns[4]["font"] = "SANSSERIF";
if (mCurrentMode == STAT_REPORT_TOP_SCRIPTS if (mCurrentMode == STAT_REPORT_TOP_SCRIPTS
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment