diff options
| author | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2016-01-11 19:59:41 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2016-01-11 19:59:41 +0200 |
| commit | 86ee5d92fcacf2fd55706a987c224b83c28f326b (patch) | |
| tree | 557bd40efa4261f12b75b45c86bda718249634a6 /indra/newview/llmutelist.cpp | |
| parent | c9c6966364ba59171313ec179b8b19f920ea6888 (diff) | |
| parent | e5887ad1d9385ba980b58e4c0ad78337fec451ab (diff) | |
Merged in andreyl_productengine/viewer-lion-marchcat (pull request #16)
MAINT-6018 [SECURITY] Open URL dialog spam
Diffstat (limited to 'indra/newview/llmutelist.cpp')
| -rwxr-xr-x | indra/newview/llmutelist.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llmutelist.cpp b/indra/newview/llmutelist.cpp index d79baf90e7..3f4f2446e8 100755 --- a/indra/newview/llmutelist.cpp +++ b/indra/newview/llmutelist.cpp @@ -315,6 +315,11 @@ BOOL LLMuteList::add(const LLMute& mute, U32 flags) { LLPipeline::removeMutedAVsLights(avatarp); } + //remove agent's notifications as well + if (localmute.mType == LLMute::AGENT) + { + LLNotifications::instance().cancelByOwner(localmute.mID); + } return TRUE; } } |