summaryrefslogtreecommitdiff
path: root/indra/newview/llimprocessing.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2020-02-03 15:13:37 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2020-02-03 15:13:37 +0200
commita52ef7ad60c8821fcb412988d838b58c0414ac8f (patch)
treea6fe2e267b2e7bf70d4a8d8227e1bc1f1152574d /indra/newview/llimprocessing.cpp
parentbc496f5f17a446af27b47cbe227e7e85089bab8d (diff)
parent712164210cf57cfde3b17c3162dc4129d52e2780 (diff)
Merge branch 'DRTVWR-499' into DRTVWR-500
Diffstat (limited to 'indra/newview/llimprocessing.cpp')
-rw-r--r--indra/newview/llimprocessing.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp
index 9633683771..6da7bbe263 100644
--- a/indra/newview/llimprocessing.cpp
+++ b/indra/newview/llimprocessing.cpp
@@ -1569,6 +1569,12 @@ void LLIMProcessing::requestOfflineMessagesCoro(std::string url)
return;
}
+ if (gAgent.getRegion() == NULL)
+ {
+ LL_WARNS("Messaging") << "Region null while attempting to load messages." << LL_ENDL;
+ return;
+ }
+
LL_INFOS("Messaging") << "Processing offline messages." << LL_ENDL;
std::vector<U8> data;