diff options
| author | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2015-06-22 20:16:56 +0300 |
|---|---|---|
| committer | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2015-06-22 20:16:56 +0300 |
| commit | c148c1d6d904785db0b8df09038be0184faa0317 (patch) | |
| tree | fd598bb4dd3f4eea25464a6437ccce6f96a9e801 /indra/newview/lltoastgroupnotifypanel.cpp | |
| parent | e0f5ed29daa3b2803aaec60a77bde8df7df292ee (diff) | |
| parent | 9b021ec787d05881bb0804c77896aa85d4ccdfe9 (diff) | |
merge changes for MAINT-4734
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); |