diff options
| author | Brett Joseph <bjoseph@vivox.com> | 2015-05-11 09:52:18 -0400 |
|---|---|---|
| committer | Brett Joseph <bjoseph@vivox.com> | 2015-05-11 09:52:18 -0400 |
| commit | 43b7fe66db159faaa84d545f97818e7a6f0f6920 (patch) | |
| tree | 6581ed36e716f6aa57b01f2861d6812294fb2261 /indra/newview/llviewermessage.cpp | |
| parent | 7cc3e9b3cf8d70fce2ba0d4a398824e599fc8c5d (diff) | |
| parent | e611e35e033e99f619b0e4938f6879c8e387efd5 (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. |