diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2026-03-08 17:40:03 -0400 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2026-03-08 17:40:03 -0400 |
| commit | 1b9c85dc2d990e68e6934e5d54e85319313e03d6 (patch) | |
| tree | 231f4282f67e7fc0d97807141e6493a7d7673b1f | |
| parent | 8ecbce9b1dd677b42b169fb929178388247e2372 (diff) | |
| parent | 7e7ae1c04ad73c0543729d79e8d24985fec91781 (diff) | |
Merge branch 'release/2026.02' into project/Flat_UI
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 2d732d0a71..ccaefebf50 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -669,6 +669,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; @@ -713,13 +716,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' |