diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2014-12-26 11:01:55 +0200 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2014-12-26 11:01:55 +0200 |
| commit | 5683d7a2f21d54604cb56e36fa8f0562a19480c4 (patch) | |
| tree | ebba6ae6a05b3b68194f48a4679ad6e7e154f8b7 /indra/newview/llviewermessage.cpp | |
| parent | 0cae102ce2513e9b17d18a39fc39030404da2397 (diff) | |
MAINT-4699 FIXED notifications list is out of order
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rwxr-xr-x | indra/newview/llviewermessage.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 44eb4361f1..0fbecd5180 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2689,7 +2689,8 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) LLSD args; args["SUBJECT"] = subj; args["MESSAGE"] = mes; - LLNotifications::instance().add(LLNotification::Params("GroupNotice").substitutions(args).payload(payload).time_stamp(LLDate(timestamp))); + LLDate notice_date = LLDate(timestamp).notNull() ? LLDate(timestamp) : LLDate::now(); + LLNotifications::instance().add(LLNotification::Params("GroupNotice").substitutions(args).payload(payload).time_stamp(notice_date)); } // Also send down the old path for now. |