diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2024-04-28 17:43:15 -0700 | 
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2024-04-28 17:43:15 -0700 | 
| commit | d4fce4990ad0527430d2b3e70be360c26d6cb46b (patch) | |
| tree | 33986e28bd834cc2a1833130ec00614f4230894a /indra | |
| parent | 62cd262ccafa000de1a155ccc171eabf9b90d5b3 (diff) | |
Reconnects to the voice server weren't happening.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llwebrtc/llwebrtc.cpp | 10 | ||||
| -rw-r--r-- | indra/llwebrtc/llwebrtc_impl.h | 2 | ||||
| -rw-r--r-- | indra/newview/llvoicewebrtc.cpp | 2 | 
3 files changed, 9 insertions, 5 deletions
| diff --git a/indra/llwebrtc/llwebrtc.cpp b/indra/llwebrtc/llwebrtc.cpp index e08ace12c5..b20d3cd4e0 100644 --- a/indra/llwebrtc/llwebrtc.cpp +++ b/indra/llwebrtc/llwebrtc.cpp @@ -652,6 +652,13 @@ LLWebRTCPeerConnectionImpl::LLWebRTCPeerConnectionImpl() :  {  } +LLWebRTCPeerConnectionImpl::~LLWebRTCPeerConnectionImpl() +{ +    terminate(); +    mSignalingObserverList.clear(); +    mDataObserverList.clear(); +} +  //  // LLWebRTCPeerConnection interface  // @@ -670,9 +677,6 @@ void LLWebRTCPeerConnectionImpl::terminate()      rtc::scoped_refptr<webrtc::MediaStreamInterface> localStream;      mLocalStream.swap(localStream); -    mSignalingObserverList.clear(); -    mDataObserverList.clear(); -      mWebRTCImpl->PostSignalingTask(          [=]()          { diff --git a/indra/llwebrtc/llwebrtc_impl.h b/indra/llwebrtc/llwebrtc_impl.h index e1031099c7..984aaef734 100644 --- a/indra/llwebrtc/llwebrtc_impl.h +++ b/indra/llwebrtc/llwebrtc_impl.h @@ -276,7 +276,7 @@ class LLWebRTCPeerConnectionImpl : public LLWebRTCPeerConnectionInterface,  {    public:      LLWebRTCPeerConnectionImpl(); -    ~LLWebRTCPeerConnectionImpl() {} +    ~LLWebRTCPeerConnectionImpl();      void init(LLWebRTCImpl * webrtc_impl);      void terminate(); diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp index 0edbe5abc2..87106ba6d5 100644 --- a/indra/newview/llvoicewebrtc.cpp +++ b/indra/newview/llvoicewebrtc.cpp @@ -87,7 +87,7 @@ namespace {      const F32 VOLUME_SCALE_WEBRTC = 0.01f;      const F32 LEVEL_SCALE_WEBRTC  = 0.008f; -    const F32 SPEAKING_AUDIO_LEVEL = 0.40; +    const F32 SPEAKING_AUDIO_LEVEL = 0.35;      static const std::string REPORTED_VOICE_SERVER_TYPE = "Secondlife WebRTC Gateway"; | 
