diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-12-01 16:16:11 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-12-01 16:16:11 -0500 |
| commit | 38a258d04a98939e12bb2cfce6caea288a7fc3a5 (patch) | |
| tree | f221aca4c34189bb1cced52a2edb86cc67314138 /indra/newview/llvoicechannel.cpp | |
| parent | 1135ba80ec569e20187c36a5364debf9eae8aab7 (diff) | |
| parent | fa9097b65f9d89fd0c8bf7b32924f0327a617cdc (diff) | |
merge
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()) { |