1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp
index 2ab4ae2edf..ddad470149 100644
--- a/indra/newview/llvoicewebrtc.cpp
+++ b/indra/newview/llvoicewebrtc.cpp
@@ -2471,7 +2471,6 @@ void LLVoiceWebRTCConnection::breakVoiceConnectionCoro()
     httpOpts->setWantHeaders(true);
 
     mOutstandingRequests++;
-    setVoiceConnectionState(VOICE_STATE_WAIT_FOR_EXIT);
 
     // tell the server to shut down the connection as a courtesy.
     // shutdownConnection will drop the WebRTC connection which will
@@ -2479,10 +2478,7 @@ void LLVoiceWebRTCConnection::breakVoiceConnectionCoro()
     LLSD result = httpAdapter->postAndSuspend(httpRequest, url, body, httpOpts);
 
     mOutstandingRequests--;
-    if (!LLWebRTCVoiceClient::isShuttingDown())
-    {
-        setVoiceConnectionState(VOICE_STATE_SESSION_EXIT);
-    }
+    setVoiceConnectionState(VOICE_STATE_SESSION_EXIT);
 }
 
 // Tell the simulator to tell the Secondlife WebRTC server that we want a voice
@@ -2745,6 +2741,7 @@ bool LLVoiceWebRTCConnection::connectionStateMachine()
             break;
 
         case VOICE_STATE_DISCONNECT:
+            setVoiceConnectionState(VOICE_STATE_WAIT_FOR_EXIT);
             LLCoros::instance().launch("LLVoiceWebRTCConnection::breakVoiceConnectionCoro",
                                        boost::bind(&LLVoiceWebRTCConnection::breakVoiceConnectionCoro, this));
             break;