diff options
| author | Jonathan Yap <none@none> | 2011-04-15 13:13:15 -0400 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2011-04-15 13:13:15 -0400 |
| commit | 04f79f63589ab35b01ec9e3d8128e68a201ff332 (patch) | |
| tree | c0f23796a3ca84964105a6c0fc7d040aa16438aa /indra | |
| parent | 547b40bfc8b0139789a2d9c5dcd1591343a2c60b (diff) | |
STORM-956 Ability to mute dialogs by muting object (or object owner)
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 103989ee80..0da60ed4ab 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -6462,9 +6462,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; } |