1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 51a7204782..53d82ff989 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -38,6 +38,7 @@
 #include "llagent.h"
 #include "lltrans.h"
 #include "lluiusage.h"
+#include "llnearbyvoicemoderation.h"
 
 const F32 LLVoiceClient::OVERDRIVEN_POWER_LEVEL = 0.7f;
 
@@ -640,6 +641,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;