diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-12-21 13:49:23 -0800 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-12-21 13:49:23 -0800 |
commit | 89eab35b8069c3e2652591c0dffe2b0214fc0666 (patch) | |
tree | 024548311b896e4055ea4a2fa1feca35ed6592eb | |
parent | 2f91768d96683515383570c8aae21bd126fd0ad6 (diff) |
DEV-44564 'speak' button PTT-toggles and displays voice monitor even when voice disabled, gives wrong impression that you should be able to talk
-rw-r--r-- | indra/newview/llspeakbutton.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llspeakbutton.cpp b/indra/newview/llspeakbutton.cpp index fd39bde118..90214a1bd7 100644 --- a/indra/newview/llspeakbutton.cpp +++ b/indra/newview/llspeakbutton.cpp @@ -61,7 +61,9 @@ void LLSpeakButton::draw() { // gVoiceClient is the authoritative global source of info regarding our open-mic state, we merely reflect that state. bool openmic = gVoiceClient->getUserPTTState(); - mSpeakBtn->setToggleState(openmic); + bool voiceenabled = gVoiceClient->voiceEnabled(); + mSpeakBtn->setToggleState(openmic && voiceenabled); + mOutputMonitor->setIsMuted(!voiceenabled); LLUICtrl::draw(); } |