diff options
| author | Jonathan Yap <none@none> | 2011-10-11 18:18:02 -0400 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2011-10-11 18:18:02 -0400 |
| commit | 5cfd34df908572045fe3ff193e2f9242b9f2025b (patch) | |
| tree | 9191dae9691e88bbba8cfb4dfdbd4e49404decd1 | |
| parent | be251b06eb785a2d301115f9c231eb5f3c906224 (diff) | |
STORM-976 Object muted by name still displays notification message when clicked
| -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 693d4c37b8..c60e91c9e7 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -576,6 +576,7 @@ Jonathan Yap STORM-1567 STORM-1572 STORM-1574 + STORM-976 Kadah Coba STORM-1060 Jondan Lundquist diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 74ee918bfe..8f3163c0cf 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1809,8 +1809,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; |