diff options
| author | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2015-10-13 20:20:09 +0300 |
|---|---|---|
| committer | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2015-10-13 20:20:09 +0300 |
| commit | 3732e0b4d2d0c311c6341bf479bbc4fa7387df0e (patch) | |
| tree | 1ca88fe8d140856687d9804f35fa75348449d9f0 /indra/newview/lltoastgroupnotifypanel.cpp | |
| parent | 4312629e7c5749b86add9d42e6e550602f34dbf5 (diff) | |
| parent | 4ec4bf3711757c71ea9007ed939efb17312fe0b6 (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); |