diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-06 21:31:34 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-06 21:31:34 +0200 |
| commit | fa39ff67f081e2e957d2ba7fd9f014747ff10963 (patch) | |
| tree | dc67779842f2a670e5c242c07e24d27ec701f8d5 /indra/newview/llimprocessing.cpp | |
| parent | 2076f4af0fc946c3bd79754a1deefc495ee7edb9 (diff) | |
| parent | 9a3f1f6a3c4506ae08c7af7f92f11da40d80ef00 (diff) | |
Merge branch 'master' into DRTVWR-497
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() |