diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-04-14 09:34:49 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-04-14 09:34:49 -0700 |
| commit | 82ae214f6a367e17dd335e80e2444cf672108821 (patch) | |
| tree | 5a2ebb115b0674698cfb0d9cbd879add63d88ece /indra/newview/llviewermessage.cpp | |
| parent | fe8dec32dbdd6085dd582c49134551638561ca0e (diff) | |
| parent | a49e11efd9e249cc6d3cf5bcffaafe1e831f2fa9 (diff) | |
Merged lindenlab/viewer-tools-update into default
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 762f75edd4..5cd92c9920 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2686,7 +2686,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. |