summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Nikolenko <maximnproductengine@lindenlab.com>2026-03-05 19:04:03 +0200
committerGitHub <noreply@github.com>2026-03-05 19:04:03 +0200
commit7e7ae1c04ad73c0543729d79e8d24985fec91781 (patch)
tree5c91845a6cfbfb93151f4aa776b498f5d05a0f38
parent3529bc5f9d29a71355f3a3666540abff57dc1a4c (diff)
#5492 don't toggle Speak button state while voice is moderated
-rw-r--r--indra/newview/llvoiceclient.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 2d732d0a71..ccaefebf50 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -669,6 +669,9 @@ void LLVoiceClient::setUserPTTState(bool ptt)
{
if (ptt)
{
+ // Nearby chat is muted by moderator, don't toggle PTT
+ if (!mUserPTTState && LLNearbyVoiceModeration::getInstance()->showNotificationIfNeeded())
+ return;
LLUIUsage::instance().logCommand("Agent.EnableMicrophone");
}
mUserPTTState = ptt;
@@ -713,13 +716,6 @@ bool LLVoiceClient::getPTTIsToggle()
void LLVoiceClient::inputUserControlState(bool down)
{
- if (down && !getUserPTTState())
- {
- // Nearby chat is muted by moderator, don't toggle PTT
- if (LLNearbyVoiceModeration::getInstance()->showNotificationIfNeeded())
- return;
- }
-
if(mPTTIsToggle)
{
if(down) // toggle open-mic state on 'down'