diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-05-23 23:36:32 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-05-23 23:36:32 +0300 |
| commit | 2216d0fb384532dd6e6b93df64c723bc2de823d0 (patch) | |
| tree | 0eeae249fcbb2b28e82bdf4d277439a2473bf253 /indra/newview/llvoicevivox.cpp | |
| parent | 3175525950ecf568eb75a6cb4f9283ee32dcd9a5 (diff) | |
| parent | 2672194b1d3eb03648861a29e57d81a38f527746 (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index cf40058c34..0d3f65502a 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -1460,6 +1460,11 @@ bool LLVivoxVoiceClient::addAndJoinSession(const sessionStatePtr_t &nextSession) LLSD timeoutResult(LLSDMap("session", "timeout")); + // We are about to start a whole new session. Anything that MIGHT still be in our + // maildrop is going to be stale and cause us much wailing and gnashing of teeth. + // Just flush it all out and start new. + voicePump.flush(); + // It appears that I need to wait for BOTH the SessionGroup.AddSession response and the SessionStateChangeEvent with state 4 // before continuing from this state. They can happen in either order, and if I don't wait for both, things can get stuck. // For now, the SessionGroup.AddSession response handler sets mSessionHandle and the SessionStateChangeEvent handler transitions to stateSessionJoined. |