diff options
| author | Rider Linden <rider@lindenlab.com> | 2016-01-15 13:36:38 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2016-01-15 13:36:38 -0800 |
| commit | e7eaa94dfa1eba24cbf1667190a0be37b2f417e4 (patch) | |
| tree | 9e9db05ef4d37698a7fa5f68149f724aa569528d /indra/newview/llmutelist.cpp | |
| parent | 34fe371bfdeb6fc83818c58660c038c372c0f64a (diff) | |
| parent | 5a5c023e291990a463b1a91846ce82c70da8daab (diff) | |
Merge VR
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; } } |