diff options
Diffstat (limited to 'indra/newview/llimprocessing.cpp')
| -rw-r--r-- | indra/newview/llimprocessing.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp index 779ed725ac..54d17be370 100644 --- a/indra/newview/llimprocessing.cpp +++ b/indra/newview/llimprocessing.cpp @@ -1206,7 +1206,8 @@ void LLIMProcessing::processNewMessage(LLUUID from_id, case IM_LURE_USER: case IM_TELEPORT_REQUEST: { - if (is_muted) + static LLCachedControl<bool> block_teleport_offers(gSavedSettings, "BlockTeleportOffers"); + if (is_muted || block_teleport_offers) { return; } @@ -1485,6 +1486,7 @@ void LLIMProcessing::processNewMessage(LLUUID from_id, LLNotification::Params params("OfferFriendship"); params.substitutions = args; params.payload = payload; + params.offer_from_agent = true; LLPostponedNotification::add<LLPostponedOfferNotification>(params, from_id, false); } } @@ -1533,7 +1535,7 @@ void LLIMProcessing::requestOfflineMessages() && isAgentAvatarValid() && gAgent.getRegion() && gAgent.getRegion()->capabilitiesReceived() - && (LLMuteList::getInstance()->isLoaded() || LLMuteList::getInstance()->getLoadFailed())) + && LLMuteList::getInstance()->updateLoadState()) { std::string cap_url = gAgent.getRegionCapability("ReadOfflineMsgs"); |