diff options
| author | Rider Linden <rider@lindenlab.com> | 2025-08-23 10:27:46 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2025-08-23 10:27:46 -0700 |
| commit | 375158eb6450a0291ec1a0f55714fbf19a8287eb (patch) | |
| tree | a3fa4bd843f919575aaddf0928eff38bae7d7b04 /indra/newview/llvoicechannel.cpp | |
| parent | 96023976f5af0b9af8e8d066d9ad4eea213f53ee (diff) | |
| parent | 37a04baf104aa394615d8e8286522988ba56c09d (diff) | |
Merge tag 'Second_Life_Release#37a04baf-2025.06' into project/lua_editor
Diffstat (limited to 'indra/newview/llvoicechannel.cpp')
| -rw-r--r-- | indra/newview/llvoicechannel.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp index cf128f381a..b3ac28eb7a 100644 --- a/indra/newview/llvoicechannel.cpp +++ b/indra/newview/llvoicechannel.cpp @@ -369,6 +369,12 @@ void LLVoiceChannel::resume() { if (sSuspendedVoiceChannel) { + if (sSuspendedVoiceChannel->callStarted()) + { + // should have channel data already, restart + sSuspendedVoiceChannel->setState(STATE_READY); + } + // won't do anything if call is already started sSuspendedVoiceChannel->activate(); } else |