From 51a72247f5ef430c9b315b9249300e6cbf7af914 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Fri, 6 May 2011 11:03:09 -0700 Subject: EXP-782 Toggling speak button while in call minimizes IM window --- indra/newview/llbottomtray.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/newview/llbottomtray.cpp') diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index cad00eed14..5b38286cf5 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -555,8 +555,14 @@ BOOL LLBottomTray::postBuild() // Localization tool doesn't understand custom buttons like mSpeakBtn->setSpeakToolTip( getString("SpeakBtnToolTip") ); mSpeakBtn->setShowToolTip( getString("VoiceControlBtnToolTip") ); + } + else + { + LLTransientFloaterMgr::getInstance()->addControlView(getChild("speak_btn")); + LLTransientFloaterMgr::getInstance()->addControlView(getChild("flyout_btn")); } + // Both parts of speak button should be initially disabled because // it takes some time between logging in to world and connecting to voice channel. getChild("speak_btn")->setEnabled(false); -- cgit v1.2.3 From 4015e6b3c7b4ff34bd679618f2231b2f53258db4 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Fri, 6 May 2011 11:39:22 -0700 Subject: fixing flyoutbtn name --- indra/newview/llbottomtray.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llbottomtray.cpp') diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index 5b38286cf5..c72cdfd1dc 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -559,7 +559,7 @@ BOOL LLBottomTray::postBuild() else { LLTransientFloaterMgr::getInstance()->addControlView(getChild("speak_btn")); - LLTransientFloaterMgr::getInstance()->addControlView(getChild("flyout_btn")); + LLTransientFloaterMgr::getInstance()->addControlView(getChild("speak_flyout_btn")); } -- cgit v1.2.3