diff options
| author | Andrew Dyukov <adyukov@productengine.com> | 2010-02-03 16:37:32 +0200 |
|---|---|---|
| committer | Andrew Dyukov <adyukov@productengine.com> | 2010-02-03 16:37:32 +0200 |
| commit | 11f732bbbe910c2a63efaeb9044d206142d69e2f (patch) | |
| tree | 4e942954493318dbd70a7ebe4b75981c913981a4 | |
| parent | cb03e6f92a5d89056ef83e97fe436a165bb3ae78 (diff) | |
No ticket. Added comments regarding EXT-4758 and LLVoiceClient::voiceWorking() in general to clear things up a bit.
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llvoiceclient.h | 1 |
2 files changed, 3 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); } diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h index 8f668dff19..a96cf18e27 100644 --- a/indra/newview/llvoiceclient.h +++ b/indra/newview/llvoiceclient.h @@ -192,6 +192,7 @@ static void updatePosition(void); void setVoiceEnabled(bool enabled); static bool voiceEnabled(); // Checks is voice working judging from mState + // Returns true if vivox has successfully logged in and is not in error state bool voiceWorking(); void setUsePTT(bool usePTT); void setPTTIsToggle(bool PTTIsToggle); |