summaryrefslogtreecommitdiff
path: root/indra/newview/llimprocessing.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2019-09-10 23:21:56 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2019-09-10 23:21:56 +0300
commitb31a93baa83dc232e331a0420800fcb6d7faa2d3 (patch)
treed19b0dcd8340aa15d3ecfb1156ca463ab9a495fc /indra/newview/llimprocessing.cpp
parent83651c49dd42d32bed8f1a3583a61e9226f85f9e (diff)
parent05fcbb5df96c93fa2ba61411c34dcb097ab02c61 (diff)
Upstream merge from lindenlab/viewer-neko
Diffstat (limited to 'indra/newview/llimprocessing.cpp')
-rw-r--r--indra/newview/llimprocessing.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp
index 5b9ef7e60a..42043a03f2 100644
--- a/indra/newview/llimprocessing.cpp
+++ b/indra/newview/llimprocessing.cpp
@@ -29,6 +29,7 @@
#include "llimprocessing.h"
#include "llagent.h"
+#include "llappviewer.h"
#include "llavatarnamecache.h"
#include "llfirstuse.h"
#include "llfloaterreg.h"
@@ -1474,6 +1475,7 @@ void LLIMProcessing::requestOfflineMessages()
static BOOL requested = FALSE;
if (!requested
&& gMessageSystem
+ && !gDisconnected
&& LLMuteList::getInstance()->isLoaded()
&& isAgentAvatarValid()
&& gAgent.getRegion()