Skip to content

Commit

Permalink
Fix mutelist popping up, I think
Browse files Browse the repository at this point in the history
LLMuteList::add should return false if nothing new was added
  • Loading branch information
LiruMouse committed Apr 7, 2020
1 parent 1361f9b commit f9185e8
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions indra/newview/llmutelist.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -336,7 +337,7 @@ BOOL LLMuteList::add(const LLMute& mute, U32 flags)
{
LLPipeline::removeMutedAVsLights(avatarp);
}
return TRUE;
return !duplicate;
}
}

Expand Down

0 comments on commit f9185e8

Please sign in to comment.