summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-02-09 17:48:35 +0200
committerMike Antipov <mantipov@productengine.com>2010-02-09 17:48:35 +0200
commit1d5df49d6abf2f22c84b77a40118ff239e7d11ac (patch)
tree217448ba1276d4cdc68c2ea044e8db41a5492bed /indra
parent41f350cee9acfc108eba68f83bf44bf5861814df (diff)
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
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llcallfloater.cpp4
1 files changed, 2 insertions, 2 deletions
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());