summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorEugene Mutavchi <emutavchi@productengine.com>2009-11-04 20:23:41 +0200
committerEugene Mutavchi <emutavchi@productengine.com>2009-11-04 20:23:41 +0200
commite8ee119da107c0c473c836f1f0233621f14e2a15 (patch)
treeb382869c805a520a3ac2167de0b1d29f2b1324db /indra/newview/skins/default/xui
parentf59c8b5e4e2625930e24ea28cd8e3a713cffed43 (diff)
Major sub-task EXT-2142, additional commit: moved call buttons panel to control panel bottom, removed other buttons from panel_call_button
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml13
-rw-r--r--indra/newview/skins/default/xui/en/panel_group_control_panel.xml26
-rw-r--r--indra/newview/skins/default/xui/en/panel_im_control_panel.xml86
3 files changed, 70 insertions, 55 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 52017218d6..24c46b314f 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
@@ -25,19 +25,23 @@
border="false"
bottom="1"
follows="left|bottom"
- height="78"
+ height="70"
left="0"
- name="panel_buttons"
+ left_pad="0"
+ name="panel_call_buttons"
+ top_pad="0"
width="180">
<button
+ bottom="10"
height="20"
- label="Call Group"
- left_delta="27"
+ label="Call"
+ left_delta="28"
name="call_btn"
width="125"/>
<button
+ bottom="40"
height="20"
label="Leave Call"
name="end_call_btn"
@@ -46,6 +50,7 @@
<button
enabled="false"
+ bottom="10"
height="20"
label="Open Voice Controls"
name="voice_ctrls_btn"
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 daa44ac75c..46f34949a8 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
@@ -19,31 +19,37 @@
top="10"
width="180"/>
+ <button
+ bottom_pad="0"
+ height="20"
+ label="Group Info"
+ left_delta="28"
+ name="group_info_btn"
+ width="125"/>
+
<panel
background_visible="true"
bg_alpha_color="0.2 0.2 0.2 1"
border="false"
bottom="1"
follows="left|bottom"
- height="98"
+ height="70"
left="0"
- name="panel_buttons"
+ left_pad="0"
+ name="panel_call_buttons"
+ top_pad="0"
width="180">
<button
- height="20"
- label="Group Info"
- left_delta="28"
- name="group_info_btn"
- width="125"/>
-
- <button
+ bottom="10"
height="20"
label="Call Group"
+ left_delta="28"
name="call_btn"
width="125"/>
<button
+ bottom="40"
height="20"
label="Leave Call"
name="end_call_btn"
@@ -52,6 +58,7 @@
<button
enabled="false"
+ bottom="10"
height="20"
label="Open Voice Controls"
name="voice_ctrls_btn"
@@ -59,4 +66,5 @@
width="125"/>
</panel>
+
</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 d144d71dce..f77a2ec730 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
@@ -2,7 +2,6 @@
<panel
border="false"
height="327"
- layout="topleft"
name="panel_im_control_panel"
width="131">
@@ -14,41 +13,64 @@
top="-10"
width="125"/>
+ <button
+ follows="left|bottom"
+ height="20"
+ label="View Profile"
+ name="view_profile_btn"
+ width="125"/>
+
+ <button
+ follows="left|bottom"
+ height="20"
+ label="Add Friend"
+ name="add_friend_btn"
+ width="125"/>
+
+ <button
+ follows="left|bottom"
+ height="20"
+ label="Teleport"
+ name="teleport_btn"
+ width="125"/>
+
+ <button
+ follows="left|bottom"
+ height="20"
+ label="Share"
+ name="share_btn"
+ width="125"/>
+
+ <button
+ follows="left|bottom"
+ height="20"
+ label="Pay"
+ name="pay_btn"
+ width="125"/>
+
<panel
background_visible="true"
bg_alpha_color="0.2 0.2 0.2 1"
border="false"
bottom="1"
follows="left|bottom"
- height="195"
+ height="70"
left="0"
- name="panel_buttons"
+ left_pad="0"
+ name="panel_call_buttons"
+ top_pad="0"
width="131">
<button
- follows="left|bottom"
- height="20"
- label="View Profile"
- left_delta="3"
- name="view_profile_btn"
- width="125"/>
-
- <button
- follows="left|bottom"
- height="20"
- label="Add Friend"
- name="add_friend_btn"
- width="125"/>
-
- <button
- follows="left|bottom"
+ bottom="10"
height="20"
label="Call"
+ left_delta="3"
name="call_btn"
width="125"/>
<button
- follows="left|bottom"
+ bottom="40"
height="20"
label="Leave Call"
name="end_call_btn"
@@ -57,33 +79,13 @@
<button
enabled="false"
- follows="left|bottom"
+ bottom="10"
height="20"
label="Open Voice Controls"
name="voice_ctrls_btn"
visible="false"
width="125"/>
- <button
- follows="left|bottom"
- height="20"
- label="Teleport"
- name="teleport_btn"
- width="125"/>
-
- <button
- follows="left|bottom"
- height="20"
- label="Share"
- name="share_btn"
- width="125"/>
-
- <button
- follows="left|bottom"
- height="20"
- label="Pay"
- name="pay_btn"
- width="125"/>
-
</panel>
+
</panel>