diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-03 17:14:50 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-03 17:14:50 +0200 |
| commit | cfc43ff67ce7a254fd7be2f284a1d9f7a318f3fb (patch) | |
| tree | 49a779a442b63054c8dd6386a4f568c299e72006 /indra/newview/llvoiceclient.cpp | |
| parent | 3689b28bf7066a750d24dbb34a809a6d2fa953ed (diff) | |
| parent | cabf4f5d58410e9c1fb8c06b0f40900119d37fa7 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 7c6ba33553..431e9625c4 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -5979,8 +5979,10 @@ bool LLVoiceClient::voiceEnabled() return gSavedSettings.getBOOL("EnableVoiceChat") && !gSavedSettings.getBOOL("CmdLineDisableVoice"); } +//AD *TODO: investigate possible merge of voiceWorking() and voiceEnabled() into one non-static method bool LLVoiceClient::voiceWorking() { + //Added stateSessionTerminated state to avoid problems with call in parcels with disabled voice (EXT-4758) return (stateLoggedIn <= mState) && (mState <= stateSessionTerminated); } |