summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2012-01-30 15:54:39 -0800
committerLeslie Linden <leslie@lindenlab.com>2012-01-30 15:54:39 -0800
commitfd56967dea7e4c53080a1ef89cc550492baf3fc8 (patch)
tree2a7a7993a550afbd7e92975cc53d633e41404583 /indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
parentc4084c71386e34f6c28d4c10199eaf1155a2855b (diff)
parent56973912198ba3410d1ab32d1a8a63a1c8c3348e (diff)
Merge with latest
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml')
-rw-r--r--indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml6
1 files changed, 1 insertions, 5 deletions
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 93cafd4a53..d68fa6ca6c 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
@@ -27,8 +27,7 @@
mouse_opaque="false"
width="147"
top="0"
- name="speakers_list_panel"
- user_resize="false">
+ name="speakers_list_panel">
<avatar_list
color="DkGray2"
follows="all"
@@ -50,7 +49,6 @@
min_height="25"
width="130"
name="call_btn_panel"
- user_resize="false"
visible="false">
<button
follows="all"
@@ -68,7 +66,6 @@
min_height="25"
width="130"
name="end_call_btn_panel"
- user_resize="false"
visible="false">
<button
follows="all"
@@ -85,7 +82,6 @@
min_height="25"
width="130"
name="voice_ctrls_btn_panel"
- user_resize="false"
visible="false">
<button
follows="all"