Skip to content
Snippets Groups Projects
Commit 4a70a50d 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))
 -- initialized agent icon, name
 -- added agent's speaker indicator

--HG--
branch : product-engine
parent a69bef19
Branches
Tags
No related merge requests found
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include "llcallfloater.h" #include "llcallfloater.h"
#include "llagentdata.h" // for gAgentID
#include "llavatarlist.h" #include "llavatarlist.h"
#include "llbottomtray.h" #include "llbottomtray.h"
#include "llparticipantlist.h" #include "llparticipantlist.h"
...@@ -70,6 +71,8 @@ BOOL LLCallFloater::postBuild() ...@@ -70,6 +71,8 @@ BOOL LLCallFloater::postBuild()
anchor_panel, this, anchor_panel, this,
getDockTongue(), LLDockControl::TOP)); getDockTongue(), LLDockControl::TOP));
initAgentData();
// update list for current session // update list for current session
updateSession(); updateSession();
...@@ -181,4 +184,16 @@ void LLCallFloater::updateTitle() ...@@ -181,4 +184,16 @@ void LLCallFloater::updateTitle()
setTitle(title); setTitle(title);
} }
void LLCallFloater::initAgentData()
{
childSetValue("user_icon", gAgentID);
std::string name;
gCacheName->getFullName(gAgentID, name);
childSetValue("user_text", name);
LLOutputMonitorCtrl* speaking_indicator = getChild<LLOutputMonitorCtrl>("speaking_indicator");
speaking_indicator->setSpeakerId(gAgentID);
}
//EOF //EOF
...@@ -83,6 +83,7 @@ class LLCallFloater : public LLDockableFloater ...@@ -83,6 +83,7 @@ class LLCallFloater : public LLDockableFloater
void refreshPartisipantList(); void refreshPartisipantList();
void onCurrentChannelChanged(const LLUUID& session_id); void onCurrentChannelChanged(const LLUUID& session_id);
void updateTitle(); void updateTitle();
void initAgentData();
private: private:
LLSpeakerMgr* mSpeakerManager; LLSpeakerMgr* mSpeakerManager;
......
...@@ -27,29 +27,30 @@ ...@@ -27,29 +27,30 @@
<panel <panel
bevel_style="in" bevel_style="in"
follows="left|right|top" follows="left|right|top"
height="73" height="62"
layout="topleft" layout="topleft"
left="0" left="0"
name="control_panel" name="control_panel"
width="285"> width="282">
<panel <panel
height="20" height="18"
follows="top|left|right"
layout="topleft" layout="topleft"
left="10" left="10"
name="my_panel" name="my_panel"
width="262"> width="263">
<avatar_icon <avatar_icon
enabled="false" enabled="false"
follows="left|top" follows="left|top"
height="18" height="18"
image_name="Generic_Person" default_icon_name="Generic_Person"
layout="topleft" layout="topleft"
left="0" left="0"
name="user_icon" name="user_icon"
top="0" top="0"
width="18" /> width="18" />
<text <text
follows="top|left" follows="top|left|right"
font="SansSerifSmallBold" font="SansSerifSmallBold"
height="16" height="16"
layout="topleft" layout="topleft"
...@@ -57,8 +58,20 @@ ...@@ -57,8 +58,20 @@
name="user_text" name="user_text"
text_color="white" text_color="white"
top="4" top="4"
use_ellipses="true"
value="Mya Avatar:" value="Mya Avatar:"
width="80" /> width="210" />
<output_monitor
auto_update="true"
draw_border="false"
follows="right"
height="16"
layout="topleft"
name="speaking_indicator"
right="-1"
top="2"
visible="true"
width="20" />
</panel> </panel>
<layout_stack <layout_stack
bottom="10" bottom="10"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment