summaryrefslogtreecommitdiff
path: root/indra/newview/llvoicevivox.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2025-02-19 14:06:26 +0200
committerGitHub <noreply@github.com>2025-02-19 14:06:26 +0200
commit8c1f00eebc6863c39d0143aeb7e37c68459d454f (patch)
treeb3c32a7800e8424d20145d198d548cac550b7956 /indra/newview/llvoicevivox.cpp
parentfd0227c52c1e45fc3ae7abd90a14d7077b1cfdd1 (diff)
parent8114850e947f2a76e54912524722c48f22851228 (diff)
Merge Forever Fps into 2025.03
Merge Forever Fps into 2025.03
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
-rw-r--r--indra/newview/llvoicevivox.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 7d6ad743bd..8792ae3285 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -2004,7 +2004,7 @@ bool LLVivoxVoiceClient::waitForChannel()
{
recordingAndPlaybackMode();
}
- else if (mProcessChannels && (mNextAudioSession == NULL) && checkParcelChanged())
+ else if (mProcessChannels && ((mNextAudioSession == NULL) || checkParcelChanged()))
{
// the parcel is changed, or we have no pending audio sessions,
// so try to request the parcel voice info