diff options
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index e6f4940471..7a914fe3f7 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -576,6 +576,7 @@ Jonathan Yap STORM-1572 STORM-1574 STORM-1579 + STORM-976 STORM-1639 STORM-910 STORM-1642 diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 369d2d757d..f0d53668d4 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1807,8 +1807,11 @@ void LLOfferInfo::initRespondFunctionMap() void inventory_offer_handler(LLOfferInfo* info) { - //If muted, don't even go through the messaging stuff. Just curtail the offer here. - if (LLMuteList::getInstance()->isMuted(info->mFromID, info->mFromName)) + // If muted, don't even go through the messaging stuff. Just curtail the offer here. + // Passing in a null UUID handles the case of where you have muted one of your own objects by_name. + // The solution for STORM-1297 seems to handle the cases where the object is owned by someone else. + if (LLMuteList::getInstance()->isMuted(info->mFromID, info->mFromName) || + LLMuteList::getInstance()->isMuted(LLUUID::null, info->mFromName)) { info->forceResponse(IOR_MUTE); return; |