diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-08-18 11:29:17 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-08-18 11:29:17 -0600 |
| commit | 9f0da75332fcbb1bc97812baf67900702d6ced85 (patch) | |
| tree | 123671904c3b349b3f557483a4a98781ce03943a /indra/newview/llimprocessing.cpp | |
| parent | 2c964e82f5ac42fbb86f551783dfb04fcdfaf460 (diff) | |
| parent | e8b31d03b4f6f0ffb981b4ea150743daf7b4a958 (diff) | |
Merge branch 'master' 6.4.8 into DRTVWR-497
Diffstat (limited to 'indra/newview/llimprocessing.cpp')
| -rw-r--r-- | indra/newview/llimprocessing.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp index 9084596878..e1b58dde51 100644 --- a/indra/newview/llimprocessing.cpp +++ b/indra/newview/llimprocessing.cpp @@ -880,10 +880,10 @@ void LLIMProcessing::processNewMessage(LLUUID from_id, // Don't break in the case of a bad binary bucket. Go ahead and show the // accept/decline popup even though it will not do anything. LL_WARNS("Messaging") << "Malformed inventory offer from object, type might be " << info->mType << LL_ENDL; - } - info->mObjectID = LLUUID::null; - info->mFromObject = TRUE; } + info->mObjectID = LLUUID::null; + info->mFromObject = TRUE; + } info->mIM = dialog; info->mFromID = from_id; @@ -1617,6 +1617,7 @@ void LLIMProcessing::requestOfflineMessagesCoro(std::string url) from_group = message_data["from_group"].asString() == "Y"; } + LLIMProcessing::processNewMessage( message_data["from_agent_id"].asUUID(), from_group, |