diff options
author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2020-07-09 14:20:11 +0300 |
---|---|---|
committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2020-07-09 14:20:11 +0300 |
commit | 8bc8b1cfd68bb088eac881853b41a5b4159e22c9 (patch) | |
tree | b0bf4b0ea7c3973338ce2eeacd5547c1df2e6257 /indra | |
parent | 05ce7511aa6ffebe78676d714a621a1fe04c66e2 (diff) |
SL-13093 Add time info to the Date column in group notices
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llpanelgroupnotices.cpp | 9 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_group_notices.xml | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp index 7373c7412c..59c6151efa 100644 --- a/indra/newview/llpanelgroupnotices.cpp +++ b/indra/newview/llpanelgroupnotices.cpp @@ -201,9 +201,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("LTimeMthNum") + "]/[" + + LLTrans::getString("LTimeDay") + "]/[" + + LLTrans::getString("LTimeYear") + "] [" + + 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 47aceb2c2e..d734249129 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml @@ -59,7 +59,7 @@ Maximum 200 per group daily <scroll_list.columns label="Date" name="date" - width="60" /> + width="100" /> <scroll_list.columns name="sort" width="-1" /> |