merge from remote repo

1 files changed, 13 insertions, 4 deletions

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 15b6b2a00d..9ed510dff3 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"
@@ -13,23 +13,32 @@
      left="3"
      name="speakers_list"
      opaque="false"
+     show_info_btn="false"
+     show_profile_btn="false"
      top="10"
      width="140" />
     <button
      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>