diff options
author | Oz Linden <oz@lindenlab.com> | 2011-04-01 17:39:08 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-04-01 17:39:08 -0400 |
commit | 1664c9dc678f7aca9c2bbf38d28e00550e03c4dd (patch) | |
tree | 9a51b54cd3a500e066c25e2c6180dd343ec639d9 /indra/newview/llfloatertopobjects.cpp | |
parent | 2deea7c9d162b9bcae29e73fca8eebd26460fbf8 (diff) | |
parent | f12d79907c7f002666291ab23dbb01ba715fa2c1 (diff) |
merge out end-of-develop.py tag from viewer-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 |