From f9185e8bc83ef4300b17cd1dcaa6332ed8f0b72e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Tue, 7 Apr 2020 05:47:25 -0400 Subject: [PATCH] Fix mutelist popping up, I think LLMuteList::add should return false if nothing new was added --- indra/newview/llmutelist.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/indra/newview/llmutelist.cpp b/indra/newview/llmutelist.cpp index 3b2151f81..aae99afdd 100644 --- a/indra/newview/llmutelist.cpp +++ b/indra/newview/llmutelist.cpp @@ -288,7 +288,8 @@ BOOL LLMuteList::add(const LLMute& mute, U32 flags) // If an entry for the same entity is already in the list, remove it, saving flags as necessary. mute_set_t::iterator it = mMutes.find(localmute); - if (it != mMutes.end()) + bool duplicate = it != mMutes.end(); + if (duplicate) { // This mute is already in the list. Save the existing entry's flags if that's warranted. localmute.mFlags = it->mFlags; @@ -336,7 +337,7 @@ BOOL LLMuteList::add(const LLMute& mute, U32 flags) { LLPipeline::removeMutedAVsLights(avatarp); } - return TRUE; + return !duplicate; } }