diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-02-04 14:43:20 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-02-04 14:43:20 -0800 |
| commit | e5c593682af3a4958316d7747d39f41e2a65e88c (patch) | |
| tree | 2c62627da1b826a4df17e5173cb5b1a8fd5ada5f /indra/newview/llviewermessage.cpp | |
| parent | 3e73b107d37e293b4e4cde91734e1e8251ba6b72 (diff) | |
| parent | 2f6ffe2183250f3f71a8d502eed9cf9df9ff8b16 (diff) | |
Pull merge from lindenlab/viewer-chui
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rwxr-xr-x | indra/newview/llviewermessage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index caafb10e25..359819ec49 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2391,7 +2391,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) // do nothing -- don't distract newbies in // Prelude with global IMs } - else if (offline == IM_ONLINE && is_do_not_disturb && name != SYSTEM_FROM) + else if (offline == IM_ONLINE && is_do_not_disturb && from_id.notNull()) { // return a standard "do not disturb" message, but only do it to online IM // (i.e. not other auto responses and not store-and-forward IM) |