summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2024-06-05 12:34:09 +0300
committerAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2024-06-05 22:08:41 +0300
commit9e584ed41b3c0509f9cae18b1831e369c10f6518 (patch)
tree11e9ea5ed0b75ec3333110653c28fce4fafa76f9 /indra
parentdb3f7eafa05636a3079037109d3d21514b25a8bb (diff)
viewer-private#244 Reconnect to voice after 'tuning'
activate() does nothing if call already started
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llvoicechannel.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp
index 7ca73a24bf..c1e6becf8d 100644
--- a/indra/newview/llvoicechannel.cpp
+++ b/indra/newview/llvoicechannel.cpp
@@ -383,6 +383,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