diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp
index f9eeaf1e9e3e237fb7ddbf0946f862d852dbda62..b54975b76b6392ea9ae9818e00e44acd5d058249 100644
--- a/indra/newview/llpanelimcontrolpanel.cpp
+++ b/indra/newview/llpanelimcontrolpanel.cpp
@@ -54,10 +54,16 @@ void LLPanelChatControlPanel::onEndCallButtonClicked()
gIMMgr->endCall(mSessionId);
}
+void LLPanelChatControlPanel::onOpenVoiceControlsClicked()
+{
+ // TODO: implement Voice Control Panel opening
+}
+
BOOL LLPanelChatControlPanel::postBuild()
{
childSetAction("call_btn", boost::bind(&LLPanelChatControlPanel::onCallButtonClicked, this));
childSetAction("end_call_btn", boost::bind(&LLPanelChatControlPanel::onEndCallButtonClicked, this));
+ childSetAction("voice_ctrls_btn", boost::bind(&LLPanelChatControlPanel::onOpenVoiceControlsClicked, this));
return TRUE;
}
@@ -73,8 +79,10 @@ void LLPanelChatControlPanel::draw()
LLVoiceChannel* voice_channel = session->mVoiceChannel;
if (voice_channel && voice_enabled)
{
- childSetVisible("end_call_btn", voice_channel->getState() >= LLVoiceChannel::STATE_CALL_STARTED);
- childSetVisible("call_btn", voice_channel->getState() < LLVoiceChannel::STATE_CALL_STARTED);
+ bool is_call_started = ( voice_channel->getState() >= LLVoiceChannel::STATE_CALL_STARTED );
+ childSetVisible("end_call_btn", is_call_started);
+ childSetVisible("voice_ctrls_btn", is_call_started);
+ childSetVisible("call_btn", ! is_call_started);
}
bool session_initialized = session->mSessionInitialized;
diff --git a/indra/newview/llpanelimcontrolpanel.h b/indra/newview/llpanelimcontrolpanel.h
index 220b7b14ba66ba1c578967105ad0e36bb7156d64..d25f33935a3f58305cfb2c5146669c4d4c0e1ff8 100644
--- a/indra/newview/llpanelimcontrolpanel.h
+++ b/indra/newview/llpanelimcontrolpanel.h
@@ -50,6 +50,7 @@ class LLPanelChatControlPanel : public LLPanel
void onCallButtonClicked();
void onEndCallButtonClicked();
+ void onOpenVoiceControlsClicked();
virtual void setSessionId(const LLUUID& session_id) { mSessionId = session_id; }
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index d9c3ff77d951c090f7b4b6e3d5c2e53a3e3477e6..26d2f4e497f707eb7cc6dd9647a4a9fe664d002f 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -3,7 +3,7 @@
legacy_header_height="18"
background_visible="true"
follows="left|top|right|bottom"
- height="250"
+ height="270"
layout="topleft"
left="0"
name="panel_im"
@@ -17,7 +17,7 @@
min_width="200"
min_height="150">
<layout_stack follows="left|top|right|bottom"
- height="235"
+ height="255"
width="365"
layout="topleft"
orientation="horizontal"
@@ -29,11 +29,11 @@
layout="topleft"
top_delta="-3"
width="146"
- height="225"
+ height="255"
follows="left"
label="IM Control Panel"
user_resize="false" />
- <layout_panel height="235"
+ <layout_panel height="255"
width="200"
left_delta="146"
top="0"
@@ -56,7 +56,7 @@
length="1"
follows="left|top|right|bottom"
font="SansSerif"
- height="185"
+ height="205"
layout="topleft"
name="chat_history"
parse_highlights="true"
diff --git a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
index 1003b4a3a8b994d84d3d735f9be0b0e72879c9d6..f50acc224f053796b42600374bac9757d6fb8425 100644
--- a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
@@ -20,12 +20,19 @@
<button
name="call_btn"
label="Call"
- width="90"
+ width="125"
height="20" />
<button
name="end_call_btn"
label="End Call"
- width="90"
+ width="125"
height="20"
visible="false"/>
+ <button
+ enabled="false"
+ name="voice_ctrls_btn"
+ label="Open Voice Controls"
+ width="125"
+ height="20"
+ visible="false"/>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
index ce952628c641f81a2ed4539a5a5373899b54216e..9ed510dff3e1feeed5f2a99f428c6529ffdc0b13 100644
--- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
@@ -2,7 +2,7 @@
<panel
name="panel_im_control_panel"
width="146"
- height="215"
+ height="238"
border="false">
<avatar_list
color="DkGray2"
@@ -21,17 +21,24 @@
name="group_info_btn"
label="Group Info"
left_delta="3"
- width="90"
+ width="125"
height="20" />
<button
name="call_btn"
label="Call"
- width="90"
+ width="125"
height="20" />
<button
name="end_call_btn"
label="End Call"
- width="90"
+ width="125"
height="20"
visible="false"/>
+ <button
+ enabled="false"
+ name="voice_ctrls_btn"
+ label="Open Voice Controls"
+ width="125"
+ height="20"
+ visible="false"/>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
index dca52def495782eb636b7658951b131e9403d68c..c4cdaa41f970cf401e376ee43599a558c21d3500 100644
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="panel_im_control_panel"
- width="96"
- height="225"
+ width="125"
+ height="248"
border="false">
<avatar_icon name="avatar_icon"
@@ -11,17 +11,17 @@
<button name="view_profile_btn"
label="View Profile"
left_delta="3"
- width="90"
+ width="125"
height="20" />
<button name="add_friend_btn"
label="Add Friend"
- width="90"
+ width="125"
height="20" />
<button name="call_btn"
label="Call"
- width="90"
+ width="125"
height="20" />
<button
@@ -29,11 +29,19 @@
label="End Call"
name="end_call_btn"
visible="false"
- width="90" />
+ width="125" />
+
+ <button
+ enabled="false"
+ name="voice_ctrls_btn"
+ label="Open Voice Controls"
+ width="125"
+ height="20"
+ visible="false"/>
<button name="share_btn"
label="Share"
- width="90"
+ width="125"
height="20" />
</panel>