From f669b484ac1c18c8a18aecb7890419c5768a0a04 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Tue, 29 Dec 2009 16:40:17 +0200
Subject: Fixed low bug EXT-3677 (Resident doesn't appear in the nearby voice
list after enabling voice) -- made participant dimmed for a few seconds
before disappearing
--HG--
branch : product-engine
---
indra/newview/llcallfloater.cpp | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index b988af3b50..651dac6635 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -565,23 +565,15 @@ void LLCallFloater::updateParticipantsVoiceState()
// HAS LEFT the call.
if ((getState(participant_id) == STATE_JOINED))
{
- if (mVoiceType == VC_LOCAL_CHAT)
+ setState(item, STATE_LEFT);
+
+ LLPointer<LLSpeaker> speaker = mSpeakerManager->findSpeaker(item->getAvatarId());
+ if (speaker.isNull())
{
- // Don't display avatars that aren't in our nearby chat range anymore as "left". Remove them immediately.
- removeVoiceLeftParticipant(participant_id);
+ continue;
}
- else
- {
- setState(item, STATE_LEFT);
- LLPointer<LLSpeaker> speaker = mSpeakerManager->findSpeaker(item->getAvatarId());
- if (speaker.isNull())
- {
- continue;
- }
-
- speaker->mHasLeftCurrentCall = TRUE;
- }
+ speaker->mHasLeftCurrentCall = TRUE;
}
// If an avatarID is not found in a speakers list from VoiceClient and
// a panel with this ID has a LEFT status this means that this person
--
cgit v1.2.3