summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-09-12 11:30:47 -0400
committerOz Linden <oz@lindenlab.com>2011-09-12 11:30:47 -0400
commit1d726db71880579a04b70ca9583f723b552a3347 (patch)
treea5e3d947e3f32047d928227fe3b96c19cb9f0837 /indra/newview/skins
parent9779fcd97a868853df3b3351a0ac14082e177c8f (diff)
parentebb213e040502e0edabb754c5e6df479e858b0d1 (diff)
merge changes for storm-1028
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/panel_bottomtray.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index c8f8d07701..ec5853649e 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -47,13 +47,13 @@
mouse_opaque="false"
name="chat_bar_layout_panel"
user_resize="true"
- width="310" >
+ width="250" >
<panel
name="chat_bar"
filename="panel_nearby_chat_bar.xml"
left="0"
height="28"
- width="308"
+ width="248"
top="0"
mouse_opaque="false"
follows="left|right"
@@ -341,7 +341,7 @@ Disabled for now.
height="28"
layout="topleft"
min_height="28"
- min_width="52"
+ min_width="62"
mouse_opaque="false"
name="mini_map_btn_panel"
user_resize="false"