diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-02 07:19:07 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-02 07:19:07 -0400 |
| commit | 5a280f320ea5ec7facd13973133c16da7c5a178b (patch) | |
| tree | 8ed9b345741483c6acdcbc354acc29cc48848254 | |
| parent | 37084d7edb5cdca4666fdf4cdc4d1fd57302c92a (diff) | |
| parent | 04f79f63589ab35b01ec9e3d8128e68a201ff332 (diff) | |
merge changes for storm-956
| -rw-r--r-- | doc/contributions.txt | 2 | ||||
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index a19967fd4d..216a40c6fc 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 d0fdae1e1b..cfffc6ecc9 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; } |