diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-07-23 12:21:18 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-07-23 12:21:18 -0600 |
| commit | 64a9ad0f5f52dac633a76e39335a7def2573b82e (patch) | |
| tree | e47af1ff1bd1db52fd93c11d857b11387bacf01a /indra/newview/llimprocessing.cpp | |
| parent | 05200cf827d9a6263adc4905bf41a4905bce2659 (diff) | |
| parent | 72423372d6cd7f763a5567ad75752fa4e7131d60 (diff) | |
Merge branch 'master' v6.4.6 into DRTVWR-497
Diffstat (limited to 'indra/newview/llimprocessing.cpp')
| -rw-r--r-- | indra/newview/llimprocessing.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp index 79cf49ddb1..9084596878 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; @@ -1404,10 +1404,8 @@ void LLIMProcessing::processNewMessage(LLUUID from_id, payload["sender"] = sender.getIPandPort(); bool add_notification = true; - for (LLToastNotifyPanel::instance_iter ti(LLToastNotifyPanel::beginInstances()) - , tend(LLToastNotifyPanel::endInstances()); ti != tend; ++ti) + for (auto& panel : LLToastNotifyPanel::instance_snapshot()) { - LLToastNotifyPanel& panel = *ti; const std::string& notification_name = panel.getNotificationName(); if (notification_name == "OfferFriendship" && panel.isControlPanelEnabled()) { |