Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix mutelist popping up, I think

Browse Source 
LLMuteList::add should return false if nothing new was added
This commit is contained in:
Liru Færs
2020-04-07 05:47:25 -04:00
parent 1361f9b57d
commit f9185e8bc8
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llmutelist.cpp
View File

@@ -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. // 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); 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. // This mute is already in the list. Save the existing entry's flags if that's warranted.
localmute.mFlags = it->mFlags; localmute.mFlags = it->mFlags;
@@ -336,7 +337,7 @@ BOOL LLMuteList::add(const LLMute& mute, U32 flags)
{ {
LLPipeline::removeMutedAVsLights(avatarp); LLPipeline::removeMutedAVsLights(avatarp);
} }
return TRUE; return !duplicate;
} }
} }