diff options
| author | Jacek Antonelli | 2008-08-15 23:45:07 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-08-15 23:45:07 -0500 |
| commit | 8465910c79b8e746e04fd581cca2d60399e569b9 (patch) | |
| tree | f43fec3e83c46e0d6190dca923d6fb268b52ffdd /linden/indra/newview/llmutelist.cpp | |
| parent | Second Life viewer sources 1.18.2.1 (diff) | |
| download | meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.zip meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.gz meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.bz2 meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.xz | |
Second Life viewer sources 1.18.3.2-RC
Diffstat (limited to 'linden/indra/newview/llmutelist.cpp')
| -rw-r--r-- | linden/indra/newview/llmutelist.cpp | 4 |
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 | |||
| 192 | BOOL LLMuteList::add(const LLMute& mute, U32 flags) | 192 | BOOL 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 | ||
| 616 | void LLMuteList::onFileMuteList(void** user_data, S32 error_code) | 616 | void 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; |