diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-10-27 15:45:21 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-10-27 15:45:21 -0700 |
| commit | b1c3ec9c0049758afbe9e13d31cc2f60348ecffb (patch) | |
| tree | 9da64a10bee7c90ac671db21df68b9e78ca72c7c /indra/newview/lltoastgroupnotifypanel.cpp | |
| parent | 9833a50260fb45d5f0033200ae756834c0cc9940 (diff) | |
| parent | 4ee02ce01a220aaf63f10c2a00556b13c7892de3 (diff) | |
Merge
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..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 : LLDate::now(); + LLDate notice_date = timeStamp.notNull() ? timeStamp : payload["received_time"].asDate(); LLSD substitution; substitution["datetime"] = (S32) notice_date.secondsSinceEpoch(); LLStringUtil::format(timeStr, substitution); |