diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-05-06 11:03:09 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-05-06 11:03:09 -0700 |
| commit | 51a72247f5ef430c9b315b9249300e6cbf7af914 (patch) | |
| tree | c7381d2ae4a7343dbb5d7b289254452af1226f2c /indra | |
| parent | f0d095086ff5bf2c231bee06064a89a8b6ef4a9b (diff) | |
EXP-782 Toggling speak button while in call minimizes IM window
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llbottomtray.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
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 <talk_button> mSpeakBtn->setSpeakToolTip( getString("SpeakBtnToolTip") ); mSpeakBtn->setShowToolTip( getString("VoiceControlBtnToolTip") ); + } + else + { + LLTransientFloaterMgr::getInstance()->addControlView(getChild<LLButton>("speak_btn")); + LLTransientFloaterMgr::getInstance()->addControlView(getChild<LLButton>("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<LLButton>("speak_btn")->setEnabled(false); |