diff options
| author | Roxanne Skelly <roxanne@roxiware.com> | 2024-04-08 04:10:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-08 04:10:34 -0700 |
| commit | f2ec9e5cca078434e624e42afec11ebd7d681e06 (patch) | |
| tree | d6afcd0bc1cf2c86e5f5a668749c01c14bf04da2 /indra/newview/llvoicewebrtc.cpp | |
| parent | a0cc1b6bd2b1f3578c8d34b634e4add20bae2dd2 (diff) | |
| parent | 648741470f67120d99aec3a4aeceeaf4395cca09 (diff) | |
Merge pull request #1150 from secondlife/roxie/webrtc-voice
Diffstat (limited to 'indra/newview/llvoicewebrtc.cpp')
| -rw-r--r-- | indra/newview/llvoicewebrtc.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp index 3cc4aa113c..cb01a079cc 100644 --- a/indra/newview/llvoicewebrtc.cpp +++ b/indra/newview/llvoicewebrtc.cpp @@ -1360,7 +1360,7 @@ bool LLWebRTCVoiceClient::isCurrentChannel(const LLSD &channelInfo) if (mSession) { - if (!channelInfo["sessionHandle"].asString().empty()) + if (!channelInfo["session_handle"].asString().empty()) { return mSession->mHandle == channelInfo["session_handle"].asString(); } @@ -2368,12 +2368,14 @@ void LLVoiceWebRTCConnection::breakVoiceConnectionCoro() if (!regionp || !regionp->capabilitiesReceived()) { LL_DEBUGS("Voice") << "no capabilities for voice provisioning; waiting " << LL_ENDL; + setVoiceConnectionState(VOICE_STATE_SESSION_RETRY); return; } std::string url = regionp->getCapability("ProvisionVoiceAccountRequest"); if (url.empty()) { + setVoiceConnectionState(VOICE_STATE_SESSION_RETRY); return; } |