summaryrefslogtreecommitdiff
path: root/indra
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:50:45 +0300
commit261ba33537235fc0ed88e2fea169dbae793ba7ff (patch)
tree22aca8d53cdf8b46223caf7627f610d6f248ef13 /indra
parenta4595bdaf2f24b8c08ae8c1e7a4b3dc9e9c2ef4b (diff)
SL-15351 'Speak' button remains active on the parcel with disabled voice
Diffstat (limited to 'indra')
-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 04d84ad905..91c6a9d4f9 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -4609,6 +4609,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