diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-12-19 09:09:20 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-12-19 09:09:20 -0500 |
| commit | 1333e9332a074e25178cd28b351bb40998617e10 (patch) | |
| tree | c229dd9782a27e3c72d7d99c4a6e15367fb8dbd9 /indra/newview/llvoicechannel.cpp | |
| parent | 6a3cb427071641585d9beb44c3e46a148f90a791 (diff) | |
| parent | 4ec9bce3c2a715f53938e4568c95b7a2bdfc9e16 (diff) | |
merge changes for 3.7.23
Diffstat (limited to 'indra/newview/llvoicechannel.cpp')
| -rwxr-xr-x | indra/newview/llvoicechannel.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp index 9a84cae403..426ca332e4 100755 --- a/indra/newview/llvoicechannel.cpp +++ b/indra/newview/llvoicechannel.cpp @@ -725,6 +725,8 @@ void LLVoiceChannelProximal::handleStatusChange(EStatusType status) // do not notify user when leaving proximal channel return; 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) if(LLVoiceClient::getInstance()->voiceEnabled() && LLVoiceClient::getInstance()->isVoiceWorking()) { |