diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-09-24 19:55:31 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-09-24 19:55:31 -0700 |
| commit | 5b0e06108b3c4373c55103dedab3306f06d392c9 (patch) | |
| tree | 0751aa10cafd8afdde0a48586214a51da8fff750 /indra/newview/llparticipantlist.cpp | |
| parent | 552f288a0caea45e30a231478a19f4243d69689c (diff) | |
CHUI-340 : Fix dupe items in the conversation model list. Refresh when resorting.
Diffstat (limited to 'indra/newview/llparticipantlist.cpp')
| -rw-r--r-- | indra/newview/llparticipantlist.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp index 09f2716773..90226e7fba 100644 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -678,8 +678,10 @@ void LLParticipantList::sort() void LLParticipantList::addAvatarIDExceptAgent(const LLUUID& avatar_id) { + // Do not add if already in there or excluded for some reason if (mExcludeAgent && gAgent.getID() == avatar_id) return; if (mAvatarList && mAvatarList->contains(avatar_id)) return; + if (findParticipant(avatar_id)) return; bool is_avatar = LLVoiceClient::getInstance()->isParticipantAvatar(avatar_id); |