From 5b0e06108b3c4373c55103dedab3306f06d392c9 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 24 Sep 2012 19:55:31 -0700
Subject: CHUI-340 : Fix dupe items in the conversation model list. Refresh
 when resorting.

---
 indra/newview/llparticipantlist.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/llparticipantlist.cpp')

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);
 
-- 
cgit v1.2.3