summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2015-11-23 12:40:01 +0200
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2015-11-23 12:40:01 +0200
commitae75d8cf6743bdae57cd3cb7bb7c867004ed0f3c (patch)
treedd8194f7a67546f8596cd71beba30e88568aa385 /indra/newview
parent97f85329e495e7ececc2708de0af6e2ffc508b9f (diff)
MAINT-5688 FIXED Viewer crashes when user in DnD calling to another user also in DnD
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llscreenchannel.cpp8
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()))