diff options
| author | Bjoseph Wombat <bjoseph@vivox.com> | 2015-07-02 12:49:55 -0400 |
|---|---|---|
| committer | Bjoseph Wombat <bjoseph@vivox.com> | 2015-07-02 12:49:55 -0400 |
| commit | 97c67a6634de418e85efcfcd116b2e00efb436e3 (patch) | |
| tree | 5411771738f8f8c56208b18fee8b00b2f02b412c /indra/newview/llvoicevivox.cpp | |
| parent | ee05fe0e5f8d73ce4db41239fae3bfe691e54db5 (diff) | |
test fix for a race condition in the state machine when switching between region
voice and P2P calls.
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
| -rwxr-xr-x | indra/newview/llvoicevivox.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index da8f51bc03..e4b045bdeb 100755 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -1951,7 +1951,10 @@ void LLVivoxVoiceClient::leaveAudioSession() void LLVivoxVoiceClient::sessionTerminateSendMessage(sessionState *session) { std::ostringstream stream; - + + sessionGroupTerminateSendMessage(session); + return; + /* LL_DEBUGS("Voice") << "Sending Session.Terminate with handle " << session->mHandle << LL_ENDL; stream << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Session.Terminate.1\">" @@ -1959,6 +1962,7 @@ void LLVivoxVoiceClient::sessionTerminateSendMessage(sessionState *session) << "</Request>\n\n\n"; writeString(stream.str()); + */ } void LLVivoxVoiceClient::sessionGroupTerminateSendMessage(sessionState *session) @@ -1977,7 +1981,9 @@ void LLVivoxVoiceClient::sessionGroupTerminateSendMessage(sessionState *session) void LLVivoxVoiceClient::sessionMediaDisconnectSendMessage(sessionState *session) { std::ostringstream stream; - + sessionGroupTerminateSendMessage(session); + return; + /* LL_DEBUGS("Voice") << "Sending Session.MediaDisconnect with handle " << session->mHandle << LL_ENDL; stream << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Session.MediaDisconnect.1\">" @@ -1987,6 +1993,7 @@ void LLVivoxVoiceClient::sessionMediaDisconnectSendMessage(sessionState *session << "</Request>\n\n\n"; writeString(stream.str()); + */ } |