diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-09 19:41:35 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-09 19:41:35 +0000 |
| commit | bc9122feb959f4a9e38681908a48b679260acb73 (patch) | |
| tree | 10b2412dd1427b77e1aee5d47e8d0901dc18ed9c /indra/newview/llcallfloater.cpp | |
| parent | 9a19daccd0a8a711ce01b140febf5fc632df0e57 (diff) | |
| parent | d3d389c69898c597746902f3875761f03a419800 (diff) | |
PE merge.
Diffstat (limited to 'indra/newview/llcallfloater.cpp')
| -rw-r--r-- | indra/newview/llcallfloater.cpp | 4 |
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()); |