diff options
| author | James Cook <james@lindenlab.com> | 2009-07-10 00:23:41 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-07-10 00:23:41 +0000 |
| commit | 91f9835176d011e963a6df7d183a3f9c093a1989 (patch) | |
| tree | 8ff0efbbf5e6579803f2e6ce132c2b7956c6ec22 /indra/newview/llchiclet.cpp | |
| parent | e8bc8264f96d179cccf7cd09de774dd7fb50bc46 (diff) | |
DEV-35118 Converted voice volume feedback icon on bottom tray to use real artwork. Converted LLOutputMonitorCtrl to use ParamBlocks to specify art. Added output_monitor.xml to specify art. Bottom bar gives volume feedback even when triggering voice with middle-mouse or keyboard binding. Reviewed with Richard.
Diffstat (limited to 'indra/newview/llchiclet.cpp')
| -rw-r--r-- | indra/newview/llchiclet.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp index 4413212361..4999d05e44 100644 --- a/indra/newview/llchiclet.cpp +++ b/indra/newview/llchiclet.cpp @@ -792,6 +792,8 @@ LLTalkButton::LLTalkButton(const LLUICtrl::Params& p) monitor_param.rect(LLRect(rc.getWidth()-20,18,rc.getWidth()-3,2)); monitor_param.visible(true); mOutputMonitor = LLUICtrlFactory::create<LLOutputMonitorCtrl>(monitor_param); + // never show "muted" because you can't mute yourself + mOutputMonitor->setIsMuted(false); mSpeakBtn->addChild(mOutputMonitor); @@ -804,10 +806,9 @@ LLTalkButton::~LLTalkButton() void LLTalkButton::draw() { - if(mSpeakBtn->getToggleState()) - { - mOutputMonitor->setPower(gVoiceClient->getCurrentPower(gAgent.getID())); - } + // Always provide speaking feedback. User can trigger speaking + // with keyboard or middle-mouse shortcut. + mOutputMonitor->setPower(gVoiceClient->getCurrentPower(gAgent.getID())); LLUICtrl::draw(); } @@ -816,7 +817,6 @@ void LLTalkButton::onClick_SpeakBtn() { bool speaking = mSpeakBtn->getToggleState(); gVoiceClient->setUserPTTState(speaking); - mOutputMonitor->setIsMuted(!speaking); } void LLTalkButton::onClick_ShowBtn() |