From b7fbe0e046fbb32b9ff2fbc46c8adb6a8913ff6a Mon Sep 17 00:00:00 2001 From: Arrehn Date: Mon, 7 Mar 2011 13:21:07 -0500 Subject: [PATCH] Improved radar time formatting, FIRE-604 from Ansariel Hiller --- indra/newview/llavatarlistitem.cpp | 6 +++++- .../newview/skins/default/xui/en/panel_avatar_list_item.xml | 6 +++--- indra/newview/skins/default/xui/en/panel_people.xml | 4 ++-- .../skins/metaharper/xui/en/panel_avatar_list_item.xml | 6 +++--- indra/newview/skins/metaharper/xui/en/panel_people.xml | 4 ++-- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp index 972d1bbace..128fbfd270 100644 --- a/indra/newview/llavatarlistitem.cpp +++ b/indra/newview/llavatarlistitem.cpp @@ -382,7 +382,11 @@ void LLAvatarListItem::showStatusFlags(bool show) void LLAvatarListItem::updateFirstSeen() { - mFirstSeenDisplay->setValue(llformat("%d", time(NULL) - mFirstSeen)); + S32 seentime = (S32)difftime(time(NULL), mFirstSeen); + S32 hours = (S32)(seentime / 3600); + S32 mins = (S32)((seentime - hours * 3600) / 60); + S32 secs = (S32)((seentime - hours * 3600 - mins * 60)); + mFirstSeenDisplay->setValue(llformat("%d:%02d:%02d", hours, mins, secs)); updateChildren(); } diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml index b0e4e379ac..e82a53adfe 100644 --- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml @@ -70,7 +70,7 @@ follows="right" image_name="payment_info_used.tga" layout="topleft" - right="-114" + right="-134" name="payment_info" tool_tip="Payment info on file" top="0" @@ -82,7 +82,7 @@ top="5" layout="topleft" left_pad="5" - right="-70" + right="-90" name="avatar_age" text_color="LtGray_50" value="0000" @@ -98,7 +98,7 @@ name="first_seen" text_color="LtGray_50" value="0000" - width="40" /> + width="60" /> AGE SEEN + width="50">SEEN + width="60" /> AGE SEEN + width="50">SEEN