diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-09-28 21:40:32 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-09-28 21:40:32 -0700 |
| commit | 4b80a5ed059d91bc37558db8ed664365e39d21d6 (patch) | |
| tree | 55cfddc381448a72b54c03347deabada9687f629 /indra/newview/llvoicechannel.cpp | |
| parent | 896f48229e577b1bcf94f2cb80d73a6bf1a9330c (diff) | |
| parent | 499f5aa9a4b46d61ee94b26d5c86bc032766af70 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llvoicechannel.cpp')
| -rwxr-xr-x | indra/newview/llvoicechannel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp index 3c3dc33772..9a84cae403 100755 --- a/indra/newview/llvoicechannel.cpp +++ b/indra/newview/llvoicechannel.cpp @@ -280,14 +280,14 @@ void LLVoiceChannel::deactivate() if (callStarted()) { setState(STATE_HUNG_UP); - + //Default mic is OFF when leaving voice calls - if (gSavedSettings.getBOOL("AutoDisengageMic") && + if (gSavedSettings.getBOOL("AutoDisengageMic") && sCurrentVoiceChannel == this && LLVoiceClient::getInstance()->getUserPTTState()) { gSavedSettings.setBOOL("PTTCurrentlyEnabled", true); - LLVoiceClient::getInstance()->inputUserControlState(true); + LLVoiceClient::getInstance()->setUserPTTState(false); } } LLVoiceClient::getInstance()->removeObserver(this); |