diff options
| author | Andrey Lihatskiy <118752495+marchcat@users.noreply.github.com> | 2026-05-21 20:03:14 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-21 20:03:14 +0300 |
| commit | 627bb8feff264a6077dcf435e5656145d566e94a (patch) | |
| tree | 55af7639161926313434d9e4a8b9872369668d5d /indra/newview/llvoiceclient.cpp | |
| parent | ff536adef0b74c20f55bd501ad593e4eef762082 (diff) | |
| parent | 15d82beb6056fa16a1ea1cbf01c5d673a95e0267 (diff) | |
Merge pull request #5852 from secondlife/marchcat/slua-26.2
26.2 -> SLua viewer
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 507154a2a3..0890b04e72 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -42,6 +42,7 @@ #include "lltrans.h" #include "lluiusage.h" #include "llmutelist.h" +#include "llnearbyvoicemoderation.h" const F32 LLVoiceClient::OVERDRIVEN_POWER_LEVEL = 0.7f; @@ -744,6 +745,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; |