livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-5688 FIXED Viewer crashes when user in DnD calling to another user also in DnD

master
Mnikolenko ProductEngine 2015-11-23 12:40:01 +02:00
parent 97f85329e4
commit ae75d8cf67
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llscreenchannel.cpp
View File

@ -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()))