diff options
author | Mike Antipov <mantipov@productengine.com> | 2009-11-25 14:52:39 +0200 |
---|---|---|
committer | Mike Antipov <mantipov@productengine.com> | 2009-11-25 14:52:39 +0200 |
commit | 9d941cf1193eaaf333dd1c9427256786b1bc60c8 (patch) | |
tree | 48a307bca41f935bfda9e4e5e722395c99ac9de5 /indra/newview/llcallfloater.cpp | |
parent | cdd9c57b2c9f02167e78322e5631822b0cd0521b (diff) |
Work on major sub-task EXT-2790 (Complete Voice Control Panel (floater) started by Lynx (LLVoiceControlPanel))
-- Implemented speakers list for local chat.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llcallfloater.cpp')
-rw-r--r-- | indra/newview/llcallfloater.cpp | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp index c6d54995bf..eaa048f5aa 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -35,15 +35,35 @@ #include "llcallfloater.h" +#include "llavatarlist.h" +#include "llparticipantlist.h" +#include "llspeakers.h" + LLCallFloater::LLCallFloater() : LLFloater(LLSD()) +, mSpeakerManager(NULL) +, mPaticipants(NULL) +, mAvatarList(NULL) { LLUICtrlFactory::getInstance()->buildFloater(this, "floater_voice_controls.xml", NULL); } LLCallFloater::~LLCallFloater() { + delete mPaticipants; + mPaticipants = NULL; +} + +// virtual +BOOL LLCallFloater::postBuild() +{ + LLFloater::postBuild(); + mAvatarList = getChild<LLAvatarList>("speakers_list"); + + mSpeakerManager = LLLocalSpeakerMgr::getInstance(); + mPaticipants = new LLParticipantList(mSpeakerManager, mAvatarList); + return TRUE; } //EOF |