diff options
author | Erik Kundiman <erik@megapahit.org> | 2024-08-14 20:52:00 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2024-08-14 20:52:00 +0800 |
commit | ce8cb73ac37ce59a76c3ebfa684e8f1c94e8fd13 (patch) | |
tree | 39237632c23f093b2ea9b0490b0a19cb2dee99e9 /indra/newview/llimview.cpp | |
parent | f58cc7facb14ff6b6763652b433524e85a728cc3 (diff) | |
parent | ab86e77818e76bdf3ef660b9fa964217265be3e7 (diff) |
Merge remote-tracking branch 'secondlife/release/webrtc-voice' into webrtc-voice
Diffstat (limited to 'indra/newview/llimview.cpp')
-rw-r--r-- | indra/newview/llimview.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index a29b883f6b..c9c70c95fe 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -3859,6 +3859,11 @@ bool LLIMMgr::startCall(const LLUUID& session_id, LLVoiceChannel::EDirection dir { voice_channel->setChannelInfo(voice_channel_info); } + else if (voice_channel->getState() < LLVoiceChannel::STATE_READY) + { + // restart if there wa an error or it was hang up + voice_channel->resetChannelInfo(); + } voice_channel->setCallDirection(direction); voice_channel->activate(); return true; |