diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-03 15:52:44 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-03 15:52:44 +0000 |
| commit | fc70ca5403acdd99b2235dbf4e513a4dd806c850 (patch) | |
| tree | d6889a962571a892f4bb1c0edfa12e188a3a96a7 /indra/newview/llvoiceclient.cpp | |
| parent | 8cbea388eaad8b40faa604f9d7fa2a64570548e2 (diff) | |
| parent | f7594c713d93f397440c4af2f566a33f1b6af099 (diff) | |
PE merge.
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 73e1b312fa..b6e7e73b9d 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -5980,8 +5980,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); } |