From 162ad0f15dbde949d734ad2c2fe4c0c867b5d17b Mon Sep 17 00:00:00 2001 From: Arrehn Date: Wed, 31 Aug 2011 02:25:31 -0400 Subject: [PATCH] FIRE-2784 Fine grained temporaral group notice sorting improvements, Kool Koolhaven --- indra/newview/llpanelgroupnotices.cpp | 11 +++++++---- .../skins/default/xui/en/panel_group_notices.xml | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp index e64192c2ae..c011c23c8e 100644 --- a/indra/newview/llpanelgroupnotices.cpp +++ b/indra/newview/llpanelgroupnotices.cpp @@ -1,4 +1,4 @@ -/** +/** * @file llpanelgroupnotices.cpp * @brief A panel to display group notices. * @@ -200,9 +200,12 @@ std::string build_notice_date(const U32& the_time) time(&t); } - std::string dateStr = "["+LLTrans::getString("LTimeMthNum")+"]/[" - +LLTrans::getString("LTimeDay")+"]/[" - +LLTrans::getString("LTimeYear")+"]"; + std::string dateStr = "["+LLTrans::getString("LTimeYear")+"]/[" + +LLTrans::getString("LTimeMthNum")+"]/[" + +LLTrans::getString("LTimeDay")+"] [" + +LLTrans::getString("LTimeHour")+"]:[" + +LLTrans::getString("LTimeMin")+"]:[" + +LLTrans::getString("LTimeSec")+"]"; LLSD substitution; substitution["datetime"] = (S32) t; LLStringUtil::format (dateStr, substitution); diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml index f5c6922f65..fb44df89ba 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml @@ -52,11 +52,11 @@ Maximum 200 per group daily + width="135" /> + width="135" />