diff options
| author | pavelkproductengine <none@none> | 2015-04-09 17:16:47 +0300 |
|---|---|---|
| committer | pavelkproductengine <none@none> | 2015-04-09 17:16:47 +0300 |
| commit | 7669f953a76d615801cec788783ca6a77528886b (patch) | |
| tree | 373ef1aaecc7413c0bcc54c41ee770a0705e9dd7 /indra/newview/lltoastgroupnotifypanel.cpp | |
| parent | 60d28437e616a6afda51a368ea40ad49a707d16c (diff) | |
MAINT-4734 (Separate transaction notices from group notice/invites)
1) fixed Mac build;
2) moved attachment icon in condensed view 1 pixel down.
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 def5a0ac7c..e22f527a65 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 : payload["received_time"]; + LLDate notice_date = timeStamp.notNull() ? timeStamp : payload["received_time"].asDate(); LLSD substitution; substitution["datetime"] = (S32) notice_date.secondsSinceEpoch(); LLStringUtil::format(timeStr, substitution); |