diff options
| author | Roxanne Skelly <roxie@lindenlab.com> | 2024-04-17 11:08:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-17 11:08:07 -0700 |
| commit | da79a4d23ad10fa8a508b48e4e2c6cd9651f0295 (patch) | |
| tree | cfbda9cd28b3af635ecc7ac45e25ffbbaa49dc3f | |
| parent | 75a9ed38c045464e4c3be58c67552e3856089312 (diff) | |
| parent | eac8043ee50c7418477c0c84d4ec0ec7094673c3 (diff) | |
Merge pull request #1256 from secondlife/roxie/webrtc-voice
[WebRTC] Update webrtc.lib to address issue with voice bars not appearing.
| -rw-r--r-- | autobuild.xml | 12 | ||||
| -rw-r--r-- | indra/newview/llvoicewebrtc.cpp | 5 |
2 files changed, 11 insertions, 6 deletions
diff --git a/autobuild.xml b/autobuild.xml index f9c99514a1..625fe72449 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2901,11 +2901,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>creds</key> <string>github</string> <key>hash</key> - <string>a49fb3bb8aaf8325e7c6c4b6036db3da16afa2c9</string> + <string>21e31d2c2fffdb59d8f50b80db079f86f2df2483</string> <key>hash_algorithm</key> <string>sha1</string> <key>url</key> - <string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.53/webrtc-m114.5735.08.53.8337236647-darwin64-8337236647.tar.zst</string> + <string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.58/webrtc-m114.5735.08.58.8716173807-darwin64-8716173807.tar.zst</string> </map> <key>name</key> <string>darwin64</string> @@ -2915,11 +2915,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>598baa054f63624a8e16883541c1f3dc7aa15a8a</string> + <string>600cabb49a889db3a29f2910f5bda08f28dd04c8</string> <key>hash_algorithm</key> <string>sha1</string> <key>url</key> - <string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.53/webrtc-m114.5735.08.53.8337236647-linux64-8337236647.tar.zst</string> + <string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.58/webrtc-m114.5735.08.58.8716173807-linux64-8716173807.tar.zst</string> </map> <key>name</key> <string>linux64</string> @@ -2931,11 +2931,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>creds</key> <string>github</string> <key>hash</key> - <string>59d5f2e40612ab7b0b1a5da8ba288f48d5979216</string> + <string>915c9face95efcc6da240aa2c4f8e6c4aa803af8</string> <key>hash_algorithm</key> <string>sha1</string> <key>url</key> - <string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.53/webrtc-m114.5735.08.53.8337236647-windows64-8337236647.tar.zst</string> + <string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.58/webrtc-m114.5735.08.58.8716173807-windows64-8716173807.tar.zst</string> </map> <key>name</key> <string>windows64</string> diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp index 710067c2bf..7743d6362a 100644 --- a/indra/newview/llvoicewebrtc.cpp +++ b/indra/newview/llvoicewebrtc.cpp @@ -2192,6 +2192,7 @@ void LLVoiceWebRTCConnection::processIceUpdatesCoro() if (LLWebRTCVoiceClient::isShuttingDown()) { + mOutstandingRequests--; return; } @@ -2281,6 +2282,7 @@ void LLVoiceWebRTCConnection::OnRenegotiationNeeded() { setVoiceConnectionState(VOICE_STATE_SESSION_RETRY); } + mCurrentStatus = LLVoiceClientStatusObserver::ERROR_UNKNOWN; }); } @@ -2369,6 +2371,7 @@ void LLVoiceWebRTCConnection::breakVoiceConnectionCoro() { LL_DEBUGS("Voice") << "no capabilities for voice provisioning; waiting " << LL_ENDL; setVoiceConnectionState(VOICE_STATE_SESSION_RETRY); + mOutstandingRequests--; return; } @@ -2376,6 +2379,7 @@ void LLVoiceWebRTCConnection::breakVoiceConnectionCoro() if (url.empty()) { setVoiceConnectionState(VOICE_STATE_SESSION_RETRY); + mOutstandingRequests--; return; } @@ -2405,6 +2409,7 @@ void LLVoiceWebRTCConnection::breakVoiceConnectionCoro() if (LLWebRTCVoiceClient::isShuttingDown()) { + mOutstandingRequests--; return; } |