From 1d5df49d6abf2f22c84b77a40118ff239e7d11ac Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Tue, 9 Feb 2010 17:48:35 +0200 Subject: Fixed normal bug EXT-5119 (Voice Control Panel should open only after call is connected, so it's not overlapped by voice notifications.) - updated condition when VCP should be shown to check voice channel state (CONNECTED) --HG-- branch : product-engine --- indra/newview/llcallfloater.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp index 97a5c3b8e2..0aaaa8e705 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -303,8 +303,8 @@ void LLCallFloater::updateSession() refreshParticipantList(); updateAgentModeratorState(); - //show floater for voice calls - if (!is_local_chat) + //show floater for voice calls & only in CONNECTED to voice channel state + if (!is_local_chat && LLVoiceChannel::STATE_CONNECTED == voice_channel->getState()) { LLIMFloater* im_floater = LLIMFloater::findInstance(session_id); bool show_me = !(im_floater && im_floater->getVisible()); -- cgit v1.2.3