summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatertopobjects.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-04-06 15:15:33 -0700
committerRichard Linden <none@none>2011-04-06 15:15:33 -0700
commit75ddf612ad29240d6d34b5044ae09e4295217766 (patch)
tree70eeb78247ef3ae779809485afaaf592aa495b34 /indra/newview/llfloatertopobjects.cpp
parent4dd471d055bea672f5eb21cfcc4d07e6b3ba3f9b (diff)
parent80efbeead1d59b64b615f8a33cb0966cf7fef9f1 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social-2
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