diff options
| author | Andrew Dyukov <adyukov@productengine.com> | 2010-02-05 19:06:57 +0200 |
|---|---|---|
| committer | Andrew Dyukov <adyukov@productengine.com> | 2010-02-05 19:06:57 +0200 |
| commit | a46a029a70ead8e09810741abaf35c53adbd2763 (patch) | |
| tree | 5ee8067f5d25ec6cacdec26b71729a1c8de6fa10 /indra/newview/llcallfloater.cpp | |
| parent | 790d72e781df91e4eb873187ac4ba5ea5be8d2c4 (diff) | |
Fixed normal bug EXT-4397 (Call isn't ended after disabling voice).
- Added customizing string with notification about ending call depending on voice availability.
- Added closing of open VCP if voice is disabled.
--HG--
branch : product-engine
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) |