summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatertopobjects.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-10 22:40:57 -0400
committerOz Linden <oz@lindenlab.com>2011-04-10 22:40:57 -0400
commit0c05c8c89632d2747ca8b364ff663d1d5505fb4d (patch)
tree9f01f2c772212fcad555176a272265b5b4d67b09 /indra/newview/llfloatertopobjects.cpp
parentdff83a1ba0592049ccdcd31177c183d62df65e85 (diff)
parentee9eef505279bf3983ec5fe4ce64ba3c38f0a76a (diff)
merge changes for storm-1117
Diffstat (limited to 'indra/newview/llfloatertopobjects.cpp')
-rw-r--r--indra/newview/llfloatertopobjects.cpp3
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