diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2026-02-10 15:55:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-10 15:55:29 -0500 |
| commit | 37dd2c70380165b51a685b7b24829f4d3e15ddd8 (patch) | |
| tree | 10183ed089ef7a00aabff640505f609199c7fc03 /indra/newview/llvoiceclient.cpp | |
| parent | e7cc46743b0a032a3091b3ea6922a4af07e5172a (diff) | |
| parent | 459bd1e943de916d4d50e2b918da756a0526f88b (diff) | |
Merge pull request #5401 from secondlife/project/voice_moderation
Voice moderation -> 26.2
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 71a9e71a9f..2d732d0a71 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -39,6 +39,7 @@ #include "llagent.h" #include "lltrans.h" #include "lluiusage.h" +#include "llnearbyvoicemoderation.h" const F32 LLVoiceClient::OVERDRIVEN_POWER_LEVEL = 0.7f; @@ -712,6 +713,13 @@ 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' |