From b52d2a2f1b0406becb80862686be7b6f2444006d Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Wed, 3 Feb 2010 22:16:18 +0200 Subject: Fixed normal bug EXT-4648 (Right segment of Speak button is disabled if nearby voice chat is disabled in estate). - Added methods for separate enabling of left and right parts of speak button and used them instead of simply enabling/disabling LLSpeakButton in bottomtray. - Made changes to reset() in LLCallFloater to show "no one near..." instead of "loading" in vcp for nearby chat in regions with disabled voice. --HG-- branch : product-engine --- indra/newview/llspeakbutton.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'indra/newview/llspeakbutton.cpp') diff --git a/indra/newview/llspeakbutton.cpp b/indra/newview/llspeakbutton.cpp index 8f2c877c7a..c5c311ed33 100644 --- a/indra/newview/llspeakbutton.cpp +++ b/indra/newview/llspeakbutton.cpp @@ -66,6 +66,16 @@ void LLSpeakButton::draw() mOutputMonitor->setIsMuted(!voiceenabled); LLUICtrl::draw(); } +void LLSpeakButton::setSpeakBtnEnabled(bool enabled) +{ + LLButton* speak_btn = getChild("speak_btn"); + speak_btn->setEnabled(enabled); +} +void LLSpeakButton::setFlyoutBtnEnabled(bool enabled) +{ + LLButton* show_btn = getChild("speak_flyout_btn"); + show_btn->setEnabled(enabled); +} LLSpeakButton::LLSpeakButton(const Params& p) : LLUICtrl(p) -- cgit v1.2.3