diff --git a/doc/contributions.txt b/doc/contributions.txt index a19967fd4d055397d0f8a0eaff3994953a70befd..216a40c6fc396375f77b1ee822c31ff406e91aef 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -424,6 +424,7 @@ Jonathan Yap STORM-1094 STORM-1077 STORM-953 + STORM-956 STORM-1095 Kage Pixel VWR-11 @@ -799,6 +800,7 @@ Thickbrick Sleaford VWR-13483 VWR-13947 VWR-24420 + STORM-956 STORM-1147 Thraxis Epsilon SVC-371 diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index d0fdae1e1b957a319ece7c32e4bee64fc1908a34..cfffc6ecc96f6677620c7fa1cec835911c1885d7 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -6465,9 +6465,12 @@ void process_script_dialog(LLMessageSystem* msg, void**) LLSD payload; LLUUID object_id; + LLUUID owner_id; + msg->getUUID("Data", "ObjectID", object_id); + msg->getUUID("OwnerData", "OwnerID", owner_id); - if (LLMuteList::getInstance()->isMuted(object_id)) + if (LLMuteList::getInstance()->isMuted(object_id) || LLMuteList::getInstance()->isMuted(owner_id)) { return; }