diff options
author | Loren Shih <seraph@lindenlab.com> | 2011-04-04 10:42:52 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2011-04-04 10:42:52 -0400 |
commit | 47781184fc50f6e9e0842c2d7fa7632038a279df (patch) | |
tree | 83522faadf17895565c38d89064aff6da51a1006 /indra/newview/llfloatertopobjects.cpp | |
parent | 0dd0758ab9114c53a274ff707d626c8fe5e7afb0 (diff) | |
parent | 3c6a09372da395a621fb35db4934af2c7c21e910 (diff) |
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'indra/newview/llfloatertopobjects.cpp')
-rw-r--r-- | indra/newview/llfloatertopobjects.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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 |