Skip to content
Snippets Groups Projects
Commit 6efd9d09 authored by Mnikolenko ProductEngine's avatar Mnikolenko ProductEngine
Browse files

MAINT-2699 FIXED Disable voice and release mic button when status is changed...

MAINT-2699 FIXED Disable voice and release mic button when status is changed to STATUS_VOICE_DISABLED.
parent 208fe312
Branches
Tags
No related merge requests found
...@@ -725,6 +725,8 @@ void LLVoiceChannelProximal::handleStatusChange(EStatusType status) ...@@ -725,6 +725,8 @@ void LLVoiceChannelProximal::handleStatusChange(EStatusType status)
// do not notify user when leaving proximal channel // do not notify user when leaving proximal channel
return; return;
case STATUS_VOICE_DISABLED: case STATUS_VOICE_DISABLED:
LLVoiceClient::getInstance()->setUserPTTState(false);
gAgent.setVoiceConnected(false);
//skip showing "Voice not available at your current location" when agent voice is disabled (EXT-4749) //skip showing "Voice not available at your current location" when agent voice is disabled (EXT-4749)
if(LLVoiceClient::getInstance()->voiceEnabled() && LLVoiceClient::getInstance()->isVoiceWorking()) if(LLVoiceClient::getInstance()->voiceEnabled() && LLVoiceClient::getInstance()->isVoiceWorking())
{ {
......
...@@ -5433,7 +5433,8 @@ void LLVivoxVoiceClient::notifyStatusObservers(LLVoiceClientStatusObserver::ESta ...@@ -5433,7 +5433,8 @@ void LLVivoxVoiceClient::notifyStatusObservers(LLVoiceClientStatusObserver::ESta
// skipped to avoid speak button blinking // skipped to avoid speak button blinking
if ( status != LLVoiceClientStatusObserver::STATUS_JOINING if ( status != LLVoiceClientStatusObserver::STATUS_JOINING
&& status != LLVoiceClientStatusObserver::STATUS_LEFT_CHANNEL) && status != LLVoiceClientStatusObserver::STATUS_LEFT_CHANNEL
&& status != LLVoiceClientStatusObserver::STATUS_VOICE_DISABLED)
{ {
bool voice_status = LLVoiceClient::getInstance()->voiceEnabled() && LLVoiceClient::getInstance()->isVoiceWorking(); bool voice_status = LLVoiceClient::getInstance()->voiceEnabled() && LLVoiceClient::getInstance()->isVoiceWorking();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment