Skip to content
Snippets Groups Projects
Commit bf6d5e97 authored by Mike Antipov's avatar Mike Antipov
Browse files

Work on major sub-task EXT-2790 (Complete Voice Control Panel (floater)...

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
parent b9f113fe
No related branches found
No related tags found
No related merge requests found
...@@ -62,8 +62,6 @@ BOOL LLCallFloater::postBuild() ...@@ -62,8 +62,6 @@ BOOL LLCallFloater::postBuild()
LLDockableFloater::postBuild(); LLDockableFloater::postBuild();
mAvatarList = getChild<LLAvatarList>("speakers_list"); mAvatarList = getChild<LLAvatarList>("speakers_list");
mSpeakerManager = LLLocalSpeakerMgr::getInstance();
mPaticipants = new LLParticipantList(mSpeakerManager, mAvatarList, false);
LLView *anchor_panel = LLBottomTray::getInstance()->getChild<LLView>("speak_panel"); LLView *anchor_panel = LLBottomTray::getInstance()->getChild<LLView>("speak_panel");
...@@ -73,4 +71,27 @@ BOOL LLCallFloater::postBuild() ...@@ -73,4 +71,27 @@ BOOL LLCallFloater::postBuild()
return TRUE; 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 //EOF
...@@ -58,6 +58,7 @@ class LLCallFloater : public LLDockableFloater ...@@ -58,6 +58,7 @@ class LLCallFloater : public LLDockableFloater
~LLCallFloater(); ~LLCallFloater();
/*virtual*/ BOOL postBuild(); /*virtual*/ BOOL postBuild();
/*virtual*/ void onOpen(const LLSD& key);
private: private:
......
...@@ -32,6 +32,8 @@ ...@@ -32,6 +32,8 @@
#include "llviewerprecompiledheaders.h" #include "llviewerprecompiledheaders.h"
#include "llfloaterreg.h"
#include "llpanelimcontrolpanel.h" #include "llpanelimcontrolpanel.h"
#include "llagent.h" #include "llagent.h"
...@@ -58,7 +60,7 @@ void LLPanelChatControlPanel::onEndCallButtonClicked() ...@@ -58,7 +60,7 @@ void LLPanelChatControlPanel::onEndCallButtonClicked()
void LLPanelChatControlPanel::onOpenVoiceControlsClicked() 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) void LLPanelChatControlPanel::onVoiceChannelStateChanged(const LLVoiceChannel::EState& old_state, const LLVoiceChannel::EState& new_state)
......
...@@ -89,6 +89,7 @@ LLParticipantList::LLParticipantList(LLSpeakerMgr* data_source, LLAvatarList* av ...@@ -89,6 +89,7 @@ LLParticipantList::LLParticipantList(LLSpeakerMgr* data_source, LLAvatarList* av
mModeratorList.insert(speakerp->mID); mModeratorList.insert(speakerp->mID);
} }
} }
mAvatarList->setDirty(true);
sort(); sort();
} }
......
...@@ -61,7 +61,6 @@ ...@@ -61,7 +61,6 @@
width="125"/> width="125"/>
<button <button
enabled="false"
bottom="10" bottom="10"
follows="all" follows="all"
height="20" height="20"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment