summaryrefslogtreecommitdiff
path: root/indra/newview/llvoiceclient.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
-rw-r--r--indra/newview/llvoiceclient.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 5a2ef248ba..2d732d0a71 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -714,7 +714,11 @@ bool LLVoiceClient::getPTTIsToggle()
void LLVoiceClient::inputUserControlState(bool down)
{
if (down && !getUserPTTState())
- LLNearbyVoiceModeration::getInstance()->showNotificationIfNeeded();
+ {
+ // Nearby chat is muted by moderator, don't toggle PTT
+ if (LLNearbyVoiceModeration::getInstance()->showNotificationIfNeeded())
+ return;
+ }
if(mPTTIsToggle)
{