diff options
| author | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2015-05-19 14:04:14 +0300 |
|---|---|---|
| committer | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2015-05-19 14:04:14 +0300 |
| commit | f62d6a886eef56c36ba6fe1758831ec31d4611c9 (patch) | |
| tree | d39d645cf21474bcd4f2d9498dc08f153fd2ae28 /indra/newview/lltoastgroupnotifypanel.cpp | |
| parent | f479235aaa94555ee0ea7a663187ae9930d7d5f4 (diff) | |
| parent | 7669f953a76d615801cec788783ca6a77528886b (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 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); |