diff options
author | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2020-01-28 21:40:35 +0200 |
---|---|---|
committer | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2020-01-28 21:40:35 +0200 |
commit | 9a3f1f6a3c4506ae08c7af7f92f11da40d80ef00 (patch) | |
tree | f32f56c49dc320442a0ed535bfbb167fe3fbf9ea /indra/newview/llimprocessing.cpp | |
parent | d656d49a77eeb65ae537c954ea4009bc22da7b2b (diff) | |
parent | 2998552f3d7447da316afdd1713595528596a0c5 (diff) |
Merged lindenlab/viewer into master
Diffstat (limited to 'indra/newview/llimprocessing.cpp')
-rw-r--r-- | indra/newview/llimprocessing.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp index e3705e82b9..61c8a3a898 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() |