diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-01 14:18:24 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-01 14:18:24 -0400 |
| commit | f12d79907c7f002666291ab23dbb01ba715fa2c1 (patch) | |
| tree | ca24c6c3d3ab368589208accaae9582173a4cf4a | |
| parent | 9f4edab4dd93753d2f51e9776d758d5918992c08 (diff) | |
| parent | 8ceff5afd679d4432bc22532dc1d98f563c0b8e4 (diff) | |
pull latest changes from viewer-autobuild2010
| -rw-r--r-- | indra/llui/tests/llurlentry_stub.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llfloatertopobjects.cpp | 3 |
2 files changed, 4 insertions, 3 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); diff --git a/indra/newview/llfloatertopobjects.cpp b/indra/newview/llfloatertopobjects.cpp index 19f6038b56..87d048c15b 100644 --- a/indra/newview/llfloatertopobjects.cpp +++ b/indra/newview/llfloatertopobjects.cpp @@ -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]["font"] = "SANSSERIF"; 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"; if (mCurrentMode == STAT_REPORT_TOP_SCRIPTS |