aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llmutelist.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llmutelist.cpp')
-rw-r--r--linden/indra/newview/llmutelist.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llmutelist.cpp b/linden/indra/newview/llmutelist.cpp
index b5764c5..024123e 100644
--- a/linden/indra/newview/llmutelist.cpp
+++ b/linden/indra/newview/llmutelist.cpp
@@ -192,7 +192,7 @@ BOOL LLMuteList::isLinden(const LLString& name) const
192BOOL LLMuteList::add(const LLMute& mute, U32 flags) 192BOOL LLMuteList::add(const LLMute& mute, U32 flags)
193{ 193{
194 // Can't mute text from Lindens 194 // Can't mute text from Lindens
195 if ((mute.mType == LLMute::AGENT || mute.mType == LLMute::BY_NAME) 195 if ((mute.mType == LLMute::AGENT)
196 && isLinden(mute.mName) && (flags & LLMute::flagTextChat || flags == 0)) 196 && isLinden(mute.mName) && (flags & LLMute::flagTextChat || flags == 0))
197 { 197 {
198 gViewerWindow->alertXml("MuteLinden"); 198 gViewerWindow->alertXml("MuteLinden");
@@ -613,7 +613,7 @@ void LLMuteList::processUseCachedMuteList(LLMessageSystem* msg, void**)
613 gMuteListp->loadFromFile(filename); 613 gMuteListp->loadFromFile(filename);
614} 614}
615 615
616void LLMuteList::onFileMuteList(void** user_data, S32 error_code) 616void LLMuteList::onFileMuteList(void** user_data, S32 error_code, LLExtStat ext_status)
617{ 617{
618 llinfos << "LLMuteList::processMuteListFile()" << llendl; 618 llinfos << "LLMuteList::processMuteListFile()" << llendl;
619 if (!gMuteListp) return; 619 if (!gMuteListp) return;