diff options
| author | Rider Linden <rider@lindenlab.com> | 2016-03-17 13:14:21 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2016-03-17 13:14:21 -0700 |
| commit | b8c1976460374e743743728ef49b38ad52c453a4 (patch) | |
| tree | 4f340d954ae3552d4dbb87b389d15d98d66eba51 /indra/newview/llscreenchannel.cpp | |
| parent | 7a0fb4fece5a92627caa08622e9584a903a3fa1d (diff) | |
| parent | 4aae7b51616c0963af4668442bdb5bfaba8c5044 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llscreenchannel.cpp')
| -rwxr-xr-x | indra/newview/llscreenchannel.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp index 6d94b178dd..ba2c37ce7c 100755 --- a/indra/newview/llscreenchannel.cpp +++ b/indra/newview/llscreenchannel.cpp @@ -36,7 +36,7 @@ #include "llviewerwindow.h" #include "llfloaterreg.h" #include "lltrans.h" - +#include "llagent.h" #include "lldockablefloater.h" #include "llsyswellwindow.h" #include "llfloaterimsession.h" @@ -265,7 +265,11 @@ void LLScreenChannel::addToast(const LLToast::Params& p) if(!show_toast && !store_toast) { - LLNotificationPtr notification = LLNotifications::instance().find(p.notif_id); + if(gAgent.isDoNotDisturb()) + { + return; + } + LLNotificationPtr notification = LLNotifications::instance().find(p.notif_id); if (notification && (!notification->canLogToIM() || !notification->hasFormElements())) |