diff options
| author | Steven Harrison (steven) <steven@lindenlab.com> | 2019-05-17 16:49:58 +0000 |
|---|---|---|
| committer | Steven Harrison (steven) <steven@lindenlab.com> | 2019-05-17 16:49:58 +0000 |
| commit | 771e6344fe5852f9d67df7476e6658d2d3facd73 (patch) | |
| tree | 80401553637251e6fd598a72f95a0d38f02db859 /indra/newview/llvoicevivox.cpp | |
| parent | 59c93cb861a3cc5ef766ec27f82e7c82fe17f54b (diff) | |
| parent | e31f4a352d2dfdcc4ccb1be459382054e354f085 (diff) | |
Pull from viewer-bear and merge
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. |