No ticket. Added comments regarding EXT-4758 and LLVoiceClient::voiceWorking() in general to clear things up a bit.
--HG-- branch : product-enginemaster
parent
cb03e6f92a
commit
11f732bbbe
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in New Issue