Commits

Anonymous committed b5e7bc6

EXT-7138 WIP Made selecting voice effects while the Voice Control Panel is docked work properly.

Comments (0)

Files changed (1)

indra/newview/llpanelvoiceeffect.cpp

 #include "llfloaterreg.h"
 #include "llpanel.h"
 #include "lltrans.h"
+#include "lltransientfloatermgr.h"
 #include "llvoiceclient.h"
 
 static LLRegisterPanelClassWrapper<LLPanelVoiceEffect> t_panel_voice_effect("panel_voice_effect");
 
 LLPanelVoiceEffect::~LLPanelVoiceEffect()
 {
+	LLView* combo_list_view = mVoiceEffectCombo->getChildView("ComboBox");
+	LLTransientFloaterMgr::getInstance()->removeControlView(combo_list_view);
+
 	if(LLVoiceClient::instanceExists())
 	{
 		LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
 {
 	mVoiceEffectCombo = getChild<LLComboBox>("voice_effect");
 
+	// Need to tell LLTransientFloaterMgr about the combo list, otherwise it can't
+	// be clicked while in a docked floater as it extends outside the floater area.
+	LLView* combo_list_view = mVoiceEffectCombo->getChildView("ComboBox");
+	LLTransientFloaterMgr::getInstance()->addControlView(combo_list_view);
+
 	LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
 	if (effect_interface)
 	{