diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-21 16:49:39 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-21 16:49:39 -0500 |
| commit | d0d647d4eda1d8202e4c076370a24d8fd9fc5c0e (patch) | |
| tree | 3626ea9746652e9fa702ca59a30957cbb5c0d9f7 /indra/newview/llspeakbutton.cpp | |
| parent | c26034531a25590e718edc4d7efa41c04aa42731 (diff) | |
| parent | 89eab35b8069c3e2652591c0dffe2b0214fc0666 (diff) | |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/llspeakbutton.cpp')
| -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(); } |