diff options
| author | callum_linden <none@none> | 2015-10-26 14:22:31 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-10-26 14:22:31 -0700 |
| commit | a89e87c72e6a351c6d1c74ae59a2d7010578d26c (patch) | |
| tree | 46b3774ade40f99d1b2d1645b8e619ff5b6dc1ce /indra/newview/lltoastgroupnotifypanel.cpp | |
| parent | 16cd296e30e95fbacefff4e291fbdd6fbf0c2c43 (diff) | |
| parent | 84150294b912d04e345007b65670c0230a2e4d79 (diff) | |
Merge with head of viewer release (3.8.6 changes)
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); |