diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 12:02:34 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 12:02:34 -0800 |
| commit | 13d4257868451d1e3a5797bd02a0e6f749cc0836 (patch) | |
| tree | bafaaa1220764a6f989f84cb434e82ef341a27c7 /indra/newview/llvoicevivox.cpp | |
| parent | 2d7697dfade4ecbb8fbe9b26a5332fc9e93f5669 (diff) | |
| parent | fc70ca5403acdd99b2235dbf4e513a4dd806c850 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index d16f59b844..739f6d51d3 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -4593,7 +4593,8 @@ BOOL LLVivoxVoiceClient::isOnlineSIP(const LLUUID &id) bool LLVivoxVoiceClient::isVoiceWorking() { - return (stateLoggedIn <= mState) && (mState <= stateLeavingSession); + //Added stateSessionTerminated state to avoid problems with call in parcels with disabled voice (EXT-4758) + return (stateLoggedIn <= mState) && (mState <= stateSessionTerminated); } // Returns true if the indicated participant in the current audio session is really an SL avatar. |