summaryrefslogtreecommitdiff
path: root/indra/newview/llvoiceclient.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-02-02 17:15:46 -0500
committerLoren Shih <seraph@lindenlab.com>2010-02-02 17:15:46 -0500
commitf22fc1e6129a7e56421a0777d69c64265d9ec4af (patch)
tree43dc78b1795ef407db7b9124472626fa77ae6621 /indra/newview/llvoiceclient.cpp
parent847a3a12208359653aa7432f7f64c31669ec8963 (diff)
parente3344abb95802646912f357d214538966f3f2357 (diff)
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
-rw-r--r--indra/newview/llvoiceclient.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 3914064d72..73e1b312fa 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -5982,7 +5982,7 @@ bool LLVoiceClient::voiceEnabled()
bool LLVoiceClient::voiceWorking()
{
- return (stateLoggedIn <= mState) && (mState <= stateLeavingSession);
+ return (stateLoggedIn <= mState) && (mState <= stateSessionTerminated);
}
void LLVoiceClient::setLipSyncEnabled(BOOL enabled)