Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Voice Update] LLPanelVoiceEffect added to LLFloaterActiveSpeakers

Browse Source 
Comments out xml menu entry for LLFloaterVoiceEffect access from LLPanelVoiceEffect is the intended method
TODO: Once Shyotl's new layout stack code comes in, make LLFloaterActiveSpeakers into a vertical stack so we can properly hide LLPanelVoiceEffect upon a debug setting.
This commit is contained in:
Lirusaito
2013-06-13 06:29:00 -04:00
parent 01ec6905ab
commit 2d71b9be17
10 changed files with 326 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llfloateractivespeakers.cpp
View File

@@ -34,12 +34,22 @@
#include "llfloateractivespeakers.h"
#include "llparticipantlist.h"
#include "llpanelvoiceeffect.h"
#include "llspeakers.h"
#include "lluictrlfactory.h"
namespace
{
void* createEffectPanel(void*)
{
return new LLPanelVoiceEffect;
}
}
LLFloaterActiveSpeakers::LLFloaterActiveSpeakers(const LLSD& seed) : mPanel(NULL)
{
mFactoryMap["active_speakers_panel"] = LLCallbackMap(createSpeakersPanel, NULL);
mFactoryMap["panel_voice_effect"] = LLCallbackMap(createEffectPanel, NULL);
// do not automatically open singleton floaters (as result of getInstance())
BOOL no_open = FALSE;
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_active_speakers.xml", &getFactoryMap(), no_open);