Work on major sub-task EXT-2790 (Complete Voice Control Panel (floater) started by Lynx (LLVoiceControlPanel))

-- implemented opening of the Voice Control Panel from the Group Chat

--HG--
branch : product-engine

indra/newview/llcallfloater.cpp

@@ -62,8 +62,6 @@ BOOL LLCallFloater::postBuild()
 	LLDockableFloater::postBuild();
 	mAvatarList = getChild<LLAvatarList>("speakers_list");
 
-	mSpeakerManager = LLLocalSpeakerMgr::getInstance();
-	mPaticipants = new LLParticipantList(mSpeakerManager, mAvatarList, false);
 
 	LLView *anchor_panel = LLBottomTray::getInstance()->getChild<LLView>("speak_panel");
 
@@ -73,4 +71,27 @@ BOOL LLCallFloater::postBuild()
 
 	return TRUE;
 }
+
+// virtual
+void LLCallFloater::onOpen(const LLSD& key)
+{
+	// by default let show nearby chat participants
+	mSpeakerManager = LLLocalSpeakerMgr::getInstance();
+
+	const LLUUID& session_id = key.asUUID();
+	LLIMModel::LLIMSession* im_session = LLIMModel::getInstance()->findIMSession(session_id);
+	if (im_session)
+	{
+		mSpeakerManager = LLIMModel::getInstance()->getSpeakerManager(session_id);
+	}
+
+	delete mPaticipants;
+	mAvatarList->clear();
+	mPaticipants = new LLParticipantList(mSpeakerManager, mAvatarList, false);
+}
+
+//////////////////////////////////////////////////////////////////////////
+/// PRIVATE SECTION
+//////////////////////////////////////////////////////////////////////////
+
 //EOF

indra/newview/llcallfloater.h

@@ -58,6 +58,7 @@ public:
 	~LLCallFloater();
 
 	/*virtual*/ BOOL postBuild();
+	/*virtual*/ void onOpen(const LLSD& key);
 
 
 private:

indra/newview/llpanelimcontrolpanel.cpp

@@ -32,6 +32,8 @@
 
 #include "llviewerprecompiledheaders.h"
 
+#include "llfloaterreg.h"
+
 #include "llpanelimcontrolpanel.h"
 
 #include "llagent.h"
@@ -58,7 +60,7 @@ void LLPanelChatControlPanel::onEndCallButtonClicked()
 
 void LLPanelChatControlPanel::onOpenVoiceControlsClicked()
 {
-	// TODO: implement Voice Control Panel opening
+	LLFloaterReg::showInstance("voice_controls", getSessionId());
 }
 
 void LLPanelChatControlPanel::onVoiceChannelStateChanged(const LLVoiceChannel::EState& old_state, const LLVoiceChannel::EState& new_state)

indra/newview/llparticipantlist.cpp

@@ -89,6 +89,7 @@ LLParticipantList::LLParticipantList(LLSpeakerMgr* data_source, LLAvatarList* av
 			mModeratorList.insert(speakerp->mID);
 		}
 	}
+	mAvatarList->setDirty(true);
 	sort();
 }
 

indra/newview/skins/default/xui/en/panel_group_control_panel.xml

@@ -61,7 +61,6 @@
          width="125"/>
 
         <button
-         enabled="false"
          bottom="10"
          follows="all" 
          height="20"