summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-06-07 21:02:44 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-06-07 21:19:48 +0300
commit4cec2d689f9a7d1791f7ea3933cc1cdc59e972ab (patch)
tree6ae49b91e68ad5584d80270626c23dc6ee7bb6a5 /indra/newview
parent7c179b8e7d0b7a0f4a9412ad4525a050a1f95bbe (diff)
SL-15351 'Speak' button remains active on the parcel with disabled voice
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llvoicevivox.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index b0f57beff8..cba2cc0e55 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -4604,6 +4604,12 @@ bool LLVivoxVoiceClient::switchChannel(
// The old session may now need to be deleted.
reapSession(oldSession);
+ // If voice was on, turn it off
+ if (LLVoiceClient::getInstance()->getUserPTTState())
+ {
+ LLVoiceClient::getInstance()->setUserPTTState(false);
+ }
+
notifyStatusObservers(LLVoiceClientStatusObserver::STATUS_VOICE_DISABLED);
}
else