diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-05 18:09:36 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-05 18:09:36 +0000 |
| commit | 47a01826b11eb044266f4c4043530f9f2a73c4dd (patch) | |
| tree | edd33c2f9a3685ab149cb7384497330037af0f7c /indra/newview/llcallfloater.cpp | |
| parent | fc9099a0faef9f077b7986651f953998d6b9ac0c (diff) | |
| parent | 95147c4529f6effcd1ed0a1d427f8ddeb033670d (diff) | |
PE merge.
Diffstat (limited to 'indra/newview/llcallfloater.cpp')
| -rw-r--r-- | indra/newview/llcallfloater.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp index 53ae001923..d405c1bbc1 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -721,7 +721,15 @@ void LLCallFloater::connectToChannel(LLVoiceChannel* channel) void LLCallFloater::onVoiceChannelStateChanged(const LLVoiceChannel::EState& old_state, const LLVoiceChannel::EState& new_state) { - updateState(new_state); + // check is voice operational and if it doesn't work hide VCP (EXT-4397) + if(LLVoiceClient::voiceEnabled() && gVoiceClient->voiceWorking()) + { + updateState(new_state); + } + else + { + closeFloater(); + } } void LLCallFloater::updateState(const LLVoiceChannel::EState& new_state) |