Skip to content
Snippets Groups Projects
Commit 76fc600e authored by Aimee Linden's avatar Aimee Linden
Browse files

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

parent d849f5c8
Branches
Tags
No related merge requests found
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#include "llfloaterreg.h" #include "llfloaterreg.h"
#include "llpanel.h" #include "llpanel.h"
#include "lltrans.h" #include "lltrans.h"
#include "lltransientfloatermgr.h"
#include "llvoiceclient.h" #include "llvoiceclient.h"
static LLRegisterPanelClassWrapper<LLPanelVoiceEffect> t_panel_voice_effect("panel_voice_effect"); static LLRegisterPanelClassWrapper<LLPanelVoiceEffect> t_panel_voice_effect("panel_voice_effect");
...@@ -51,6 +52,9 @@ LLPanelVoiceEffect::LLPanelVoiceEffect() ...@@ -51,6 +52,9 @@ LLPanelVoiceEffect::LLPanelVoiceEffect()
LLPanelVoiceEffect::~LLPanelVoiceEffect() LLPanelVoiceEffect::~LLPanelVoiceEffect()
{ {
LLView* combo_list_view = mVoiceEffectCombo->getChildView("ComboBox");
LLTransientFloaterMgr::getInstance()->removeControlView(combo_list_view);
if(LLVoiceClient::instanceExists()) if(LLVoiceClient::instanceExists())
{ {
LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface(); LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
...@@ -66,6 +70,11 @@ BOOL LLPanelVoiceEffect::postBuild() ...@@ -66,6 +70,11 @@ BOOL LLPanelVoiceEffect::postBuild()
{ {
mVoiceEffectCombo = getChild<LLComboBox>("voice_effect"); 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(); LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
if (effect_interface) if (effect_interface)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment