summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/panel_bottomtray.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-10 13:40:36 -0500
committerOz Linden <oz@lindenlab.com>2011-03-10 13:40:36 -0500
commit57c5d474013793f622ac77a139251a54b056cb00 (patch)
tree8cd490d3bb86e74bfcd701ee400bccda74791629 /indra/newview/skins/default/xui/en/panel_bottomtray.xml
parentd3ca4983a4526c7fcf9eb9609e007ded74c47c05 (diff)
parent0c02401498521f87d38778df0e795960aa5445e1 (diff)
pull 2.5.1 tag back from viewer-release
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_bottomtray.xml')
-rw-r--r--indra/newview/skins/default/xui/en/panel_bottomtray.xml35
1 files changed, 27 insertions, 8 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 013a8090f7..a92cc886e7 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -45,11 +45,11 @@
min_width="214"
height="28"
mouse_opaque="false"
- name="chat_bar_layout_panel"
+ name="chat_bar_layout_panel"
user_resize="true"
- width="308" >
+ width="310" >
<panel
- name="chat_bar"
+ name="chat_bar"
filename="panel_nearby_chat_bar.xml"
left="0"
height="28"
@@ -60,11 +60,30 @@
/>
</layout_panel>
<!--
- There is resize bar between chatbar and Speak button. It has 2px width (is is set as 2*UIResizeBarOverlap)
+ This 5px Panel is an indicator of where the resize handle is.
+ The panel provides a gap between the resize handle icon and a button to the right.
-->
<layout_panel
auto_resize="false"
- follows="right"
+ layout="topleft"
+ max_width="5"
+ min_width="5"
+ name="chat_bar_resize_handle_panel"
+ user_resize="false"
+ width="5">
+ <icon
+ follows="top|right"
+ height="25"
+ image_name="ChatBarHandle"
+ layout="topleft"
+ left="-7"
+ name="resize_handle"
+ top="4"
+ width="5" />
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ follows="left|right"
height="28"
layout="topleft"
min_height="28"
@@ -72,13 +91,13 @@
mouse_opaque="false"
name="speak_panel"
top_delta="0"
- user_resize="true"
- width="110">
+ user_resize="false"
+ width="108">
<talk_button
follows="left|right"
height="23"
layout="topleft"
- left="2"
+ left="0"
name="talk"
top="5"
width="105">