diff options
| author | paul_productengine <none@none> | 2011-02-18 15:28:38 +0200 |
|---|---|---|
| committer | paul_productengine <none@none> | 2011-02-18 15:28:38 +0200 |
| commit | 23717a09183351d08306d04589a25a1b8643cdf1 (patch) | |
| tree | 5c81d096167bb6012af320e1e11a32a214edc5d8 /indra/newview/llviewermenu.cpp | |
| parent | 1a79aeca54db6ee5bf1fb2968c2642f8a3306091 (diff) | |
BUG STORM-1004 FIXED Unblocking/blocking name sometimes deletes identically named entry, but of different TYPE
LLMuteList stores muted objects in two sets: set of names and set of ids. Avatar objects are stored by ids (set of ids), other objects can be stored both by name(set of names) or ids
- Delete items from corresponding set (from set of names or ids), not form both sets at time.
- Improved isMuted method's logic. Now if avatar is tested whether it's muted or not, don't search its name in the set of names.
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 7cc04e0338..ba5816e095 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); } |