1 files changed, 9 insertions, 6 deletions
diff --git a/indra/newview/llvoicewebrtc.h b/indra/newview/llvoicewebrtc.h
index 96d39f3928..aa3298ec1b 100644
--- a/indra/newview/llvoicewebrtc.h
+++ b/indra/newview/llvoicewebrtc.h
@@ -203,7 +203,9 @@ public:
 
     void OnConnectionEstablished(const std::string& channelID, const LLUUID& regionID);
     void OnConnectionShutDown(const std::string &channelID, const LLUUID &regionID);
-    void OnConnectionFailure(const std::string &channelID, const LLUUID& regionID);
+    void OnConnectionFailure(const std::string &channelID,
+        const LLUUID &regionID,
+        LLVoiceClientStatusObserver::EStatusType status_type = LLVoiceClientStatusObserver::ERROR_UNKNOWN);
     void sendPositionUpdate(bool force);
     void updateOwnVolume();
 
@@ -603,10 +605,10 @@ class LLVoiceWebRTCConnection :
     void sendJoin();
     void sendData(const std::string &data);
 
-    virtual void processIceUpdates();
-    virtual void onIceUpdateComplete(bool ice_completed, const LLSD &result);
-    virtual void onIceUpdateError(int retries, std::string url, LLSD body, bool ice_completed, const LLSD &result);
+    void processIceUpdates();
 
+    void processIceUpdatesCoro();
+ 
     virtual void setMuteMic(bool muted);
     virtual void setMicGain(F32 volume);
     virtual void setSpeakerVolume(F32 volume);
@@ -673,7 +675,9 @@ class LLVoiceWebRTCConnection :
     virtual void requestVoiceConnection() = 0;
     void requestVoiceConnectionCoro() { requestVoiceConnection(); }
 
-    void breakVoiceConnection();
+    void breakVoiceConnectionCoro();
+
+    LLVoiceClientStatusObserver::EStatusType mCurrentStatus;
 
     LLUUID mRegionID;
     LLUUID mViewerSession;
@@ -697,7 +701,6 @@ class LLVoiceWebRTCConnection :
 
     std::vector<llwebrtc::LLWebRTCIceCandidate> mIceCandidates;
     bool                                        mIceCompleted;
-    bool                                        mTrickling;
 
     llwebrtc::LLWebRTCPeerConnectionInterface *mWebRTCPeerConnectionInterface;
     llwebrtc::LLWebRTCAudioInterface *mWebRTCAudioInterface;