diff options
author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2020-07-23 16:54:55 +0300 |
---|---|---|
committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2020-07-23 16:54:55 +0300 |
commit | 90978393950cfdd544c215ae0fea43669cc6c2b5 (patch) | |
tree | 5abc66954e35c5ba60e8d2e79518865ca7f8c369 /indra | |
parent | ae48c7c8b353d44287db06c3ad52b9ccfcf1b4e4 (diff) |
SL-13648 FIXED Issue with group notice date sorting
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llpanelgroupnotices.cpp | 6 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_group_notices.xml | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp index 59c6151efa..c63d04cd55 100644 --- a/indra/newview/llpanelgroupnotices.cpp +++ b/indra/newview/llpanelgroupnotices.cpp @@ -201,9 +201,9 @@ 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") + "]"; 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 d734249129..a5aca5c72b 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml @@ -59,6 +59,7 @@ Maximum 200 per group daily <scroll_list.columns label="Date" name="date" + sort_column="sort" width="100" /> <scroll_list.columns name="sort" |