diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-20 16:45:00 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-20 16:45:00 -0400 |
| commit | 140ce422b8f7e57316794367335975110ed8a4b0 (patch) | |
| tree | 6436ec03119d31d06074b2c02bfa59a4588aa7fa /indra/newview | |
| parent | a61401140e7effde9b39ae04b117b0f444ecd8bb (diff) | |
| parent | 5cfd34df908572045fe3ff193e2f9242b9f2025b (diff) | |
merge changes for storm-976
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
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; |