diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-09-09 10:40:25 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-09-09 10:40:25 -0700 |
| commit | 81ea8d1751a8866b9ec998542c7d6e9b5645f357 (patch) | |
| tree | 1f7f45a9bcf469efe9fc30c68aee2638342c1557 /indra/newview/llspeakbutton.cpp | |
| parent | f2d61c7371171e0ee1329186116c585aa5de7f52 (diff) | |
| parent | 72e597a6f9e6dacbb41383ee8ee29e55acff4b74 (diff) | |
Pull from lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llspeakbutton.cpp')
| -rw-r--r-- | indra/newview/llspeakbutton.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llspeakbutton.cpp b/indra/newview/llspeakbutton.cpp index b8838346d0..3dce66f394 100644 --- a/indra/newview/llspeakbutton.cpp +++ b/indra/newview/llspeakbutton.cpp @@ -37,6 +37,8 @@ #include "llspeakbutton.h" +#include "llbottomtray.h" + static LLDefaultChildRegistry::Register<LLSpeakButton> t1("talk_button"); ////////////////////////////////////////////////////////////////////////// @@ -67,7 +69,7 @@ void LLSpeakButton::setSpeakBtnEnabled(bool enabled) } void LLSpeakButton::setFlyoutBtnEnabled(bool enabled) { - LLButton* show_btn = getChild<LLButton>("speak_flyout_btn"); + LLButton* show_btn = getChild<LLBottomtrayButton>("speak_flyout_btn"); show_btn->setEnabled(enabled); } @@ -96,9 +98,9 @@ LLSpeakButton::LLSpeakButton(const Params& p) mSpeakBtn->setMouseUpCallback(boost::bind(&LLSpeakButton::onMouseUp_SpeakBtn, this)); mSpeakBtn->setToggleState(FALSE); - LLButton::Params show_params = p.show_button; + LLBottomtrayButton::Params show_params = p.show_button; show_params.rect(show_rect); - mShowBtn = LLUICtrlFactory::create<LLButton>(show_params); + mShowBtn = LLUICtrlFactory::create<LLBottomtrayButton>(show_params); addChild(mShowBtn); LLTransientFloaterMgr::getInstance()->addControlView(mShowBtn); |