diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-09-07 22:31:26 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-09-07 22:31:26 +0000 |
| commit | 0bd992b07cf17ac0e327cb95d6207883d88a60a3 (patch) | |
| tree | 0c2b2d3db24c1b6a27193a201526f5cf7aeaf807 | |
| parent | b2595c369f78b6613e329274f5ca7c43c4ddeda0 (diff) | |
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)
| -rw-r--r-- | indra/newview/llmutelist.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmutelist.cpp b/indra/newview/llmutelist.cpp index eb0b7e620a..af86c801ac 100644 --- a/indra/newview/llmutelist.cpp +++ b/indra/newview/llmutelist.cpp @@ -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)) { diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index b27d3d8742..f907ac698e 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -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); } |