diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-01 15:24:52 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-01 15:24:52 -0800 |
| commit | 0748420c9453e75d5f942b4eddf3d85b246c9cae (patch) | |
| tree | b29fcf6ea96490d6b7665f8e7a073a63a12e693c /indra/newview | |
| parent | 2ef66a7cfa9f82cda7edc34225742d82a18be1ad (diff) | |
| parent | 23717a09183351d08306d04589a25a1b8643cdf1 (diff) | |
STORM-1004 : pull into viewer-development
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llmutelist.cpp | 25 | ||||
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 2 |
2 files changed, 15 insertions, 12 deletions
diff --git a/indra/newview/llmutelist.cpp b/indra/newview/llmutelist.cpp index af8fdb17cf..a7059eb519 100644 --- a/indra/newview/llmutelist.cpp +++ b/indra/newview/llmutelist.cpp @@ -373,17 +373,19 @@ BOOL LLMuteList::remove(const LLMute& mute, U32 flags) // Must be after erase. setLoaded(); // why is this here? -MG } - - // Clean up any legacy mutes - string_set_t::iterator legacy_it = mLegacyMutes.find(mute.mName); - if (legacy_it != mLegacyMutes.end()) + else { - // Database representation of legacy mute is UUID null. - LLMute mute(LLUUID::null, *legacy_it, LLMute::BY_NAME); - updateRemove(mute); - mLegacyMutes.erase(legacy_it); - // Must be after erase. - setLoaded(); // why is this here? -MG + // Clean up any legacy mutes + string_set_t::iterator legacy_it = mLegacyMutes.find(mute.mName); + if (legacy_it != mLegacyMutes.end()) + { + // Database representation of legacy mute is UUID null. + LLMute mute(LLUUID::null, *legacy_it, LLMute::BY_NAME); + updateRemove(mute); + mLegacyMutes.erase(legacy_it); + // Must be after erase. + setLoaded(); // why is this here? -MG + } } return found; @@ -607,7 +609,8 @@ BOOL LLMuteList::isMuted(const LLUUID& id, const std::string& name, U32 flags) c } // empty names can't be legacy-muted - if (name.empty()) return FALSE; + bool avatar = mute_object && mute_object->isAvatar(); + if (name.empty() || avatar) return FALSE; // Look in legacy pile string_set_t::const_iterator legacy_it = mLegacyMutes.find(name); diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 0a76f8e716..425fe4eafb 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -2835,7 +2835,7 @@ class LLObjectMute : public view_listener_t } LLMute mute(id, name, type); - if (LLMuteList::getInstance()->isMuted(mute.mID, mute.mName)) + if (LLMuteList::getInstance()->isMuted(mute.mID)) { LLMuteList::getInstance()->remove(mute); } |