livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-51287 Muted users not visibly shown anymore 

SL-54168 "Users muted by voice are also muted by text".
Updated Vivox SDK 2.0.2318.

(josh: This appears to be svn merge -r 68529:69170 svn+ssh://svn/svn/linden/branches/bhear3-maintenance1)
master
Steven Bennetts 2007-09-07 22:31:26 +00:00
parent b2595c369f
commit 0bd992b07c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llmutelist.cpp
View File

@ -254,7 +254,7 @@ BOOL LLMuteList::add(const LLMute& mute, U32 flags)
if (result.second)
{
llinfos << "Muting " << localmute.mName << " id " << localmute.mID << " flags " << localmute.mFlags << llendl;
updateAdd(mute);
updateAdd(localmute);
notifyObservers();
if(!(localmute.mFlags & LLMute::flagParticles))
{

2
indra/newview/llviewermessage.cpp
View File

@ -2151,7 +2151,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
if (gMuteListp)
{
is_muted = gMuteListp->isMuted(from_id, from_name, LLMute::flagTextChat)
|| gMuteListp->isMuted(owner_id);
|| gMuteListp->isMuted(owner_id, LLMute::flagTextChat);
is_linden = chat.mSourceType != CHAT_SOURCE_OBJECT && gMuteListp->isLinden(from_name);
}