Merge tag 'Second_Life_Release#f148dbcc-26.2' into 2026.02

1 files changed, 3 insertions, 7 deletions

diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 91d5451bff..4fd0a8e2b8 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -749,6 +749,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;
@@ -793,13 +796,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'