diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-10-29 10:11:57 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-10-29 10:11:57 -0400 |
| commit | 848c1909c5879ac2ef2a5d40c756269aa0a40179 (patch) | |
| tree | 46a8d2bebe234de772ed7a071268887332edbda3 /indra/newview/lltoastgroupnotifypanel.cpp | |
| parent | 4b05ac4ce1b8262db94b4902987efbb5eea03e49 (diff) | |
| parent | 84150294b912d04e345007b65670c0230a2e4d79 (diff) | |
merge changes for 3.8.6-release
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); |