diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-04-13 17:19:27 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-04-13 17:19:27 -0400 |
| commit | 32940ee90b6dae898f83cf99516f18f106246ace (patch) | |
| tree | 1fca162d8adc5b7aed5a0193627d6caf773f09fd /indra/newview/llviewermessage.cpp | |
| parent | cddfcda1677c4a5d25d2adc54eb4c3aef0953ee1 (diff) | |
| parent | a647b8f1cbab13f07ea889c80df28414bc906129 (diff) | |
merge
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. |