diff options
| author | pavelk_productengine <pavelkproductengine@lindenlab.com> | 2015-04-08 19:51:39 +0300 |
|---|---|---|
| committer | pavelk_productengine <pavelkproductengine@lindenlab.com> | 2015-04-08 19:51:39 +0300 |
| commit | 60d28437e616a6afda51a368ea40ad49a707d16c (patch) | |
| tree | 04f154acd879dc11c9a05e078030918bd0966eb9 /indra/newview/lltoastgroupnotifypanel.cpp | |
| parent | b147d659dc0c94a972f1c82f16536b374ee10c19 (diff) | |
MAINT-4734 (Separate transaction notices from group notice/invites)
1) added GroupNotice notification type and tab "Group" for it;
2) added Attachment field to group notice notifications which may contain inventory offers, notecards, etc;
3) added Fee field to Group Invite notifications;
4) added notification resize depending on attachment field.
Diffstat (limited to 'indra/newview/lltoastgroupnotifypanel.cpp')
| -rwxr-xr-x | indra/newview/lltoastgroupnotifypanel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltoastgroupnotifypanel.cpp b/indra/newview/lltoastgroupnotifypanel.cpp index e00b18dedb..def5a0ac7c 100755 --- a/indra/newview/lltoastgroupnotifypanel.cpp +++ b/indra/newview/lltoastgroupnotifypanel.cpp @@ -92,7 +92,7 @@ LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(const LLNotificationPtr& notifi +LLTrans::getString("UTCTimeSec")+"] [" +LLTrans::getString("UTCTimeTimezone")+"]"; const LLDate timeStamp = notification->getDate(); - LLDate notice_date = timeStamp.notNull() ? timeStamp : LLDate::now(); + LLDate notice_date = timeStamp.notNull() ? timeStamp : payload["received_time"]; LLSD substitution; substitution["datetime"] = (S32) notice_date.secondsSinceEpoch(); LLStringUtil::format(timeStr, substitution); |