summaryrefslogtreecommitdiff
path: root/indra/newview/llimprocessing.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2020-08-18 19:16:03 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2020-08-18 19:16:03 +0300
commitcfe0ba90352c48a2b9f5006c4c8e824dc472cdc9 (patch)
tree58515df5648b7a7819b4cb62e88431c1b4747e79 /indra/newview/llimprocessing.cpp
parent61e318564e5c492ff7da70ef05f9596c4af8d369 (diff)
parente8b31d03b4f6f0ffb981b4ea150743daf7b4a958 (diff)
Merge branch 'master' into DRTVWR-515-maint
# Conflicts: # indra/newview/llimprocessing.cpp
Diffstat (limited to 'indra/newview/llimprocessing.cpp')
-rw-r--r--indra/newview/llimprocessing.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp
index 6ccb9766a5..ab98c5f50f 100644
--- a/indra/newview/llimprocessing.cpp
+++ b/indra/newview/llimprocessing.cpp
@@ -1616,6 +1616,11 @@ void LLIMProcessing::requestOfflineMessagesCoro(std::string url)
{
from_group = message_data["from_group"].asString() == "Y";
}
+ else
+ {
+ from_group = message_data["from_group"].asString() == "Y";
+ }
+
LLIMProcessing::processNewMessage(
message_data["from_agent_id"].asUUID(),