diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-03-18 14:05:02 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-03-18 14:05:02 -0700 |
| commit | ee68e52dc83d5f00acb4da96aca6148ffbd89920 (patch) | |
| tree | 9feb6d5290fb7b71d5cdd50d8909e5d1d349f859 /indra/newview | |
| parent | 179c412a6d1476f17873acc73e54ea8a4f191748 (diff) | |
| parent | 5f01cf3b1c76a53a576a10820e2cb366d1e76714 (diff) | |
Merge
Diffstat (limited to 'indra/newview')
| -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. |