summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorEugene Mutavchi <emutavchi@productengine.com>2009-11-04 22:17:23 +0200
committerEugene Mutavchi <emutavchi@productengine.com>2009-11-04 22:17:23 +0200
commit8c27615aa5c1fc61fa0a5877717699d5df47476d (patch)
tree86b35df06b8abddc9774cdd3f907b6ae13b131ef /indra/newview/skins/default/xui/en
parent5a2424d01026327ae8eb17ec2b319495c6f5e9b1 (diff)
Implemented normal sub-task EXT-2144 (IM P2p control panel should contain avatar name under avatar icon aligned to the left side)
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/floater_im_session.xml14
-rw-r--r--indra/newview/skins/default/xui/en/panel_im_control_panel.xml12
2 files changed, 18 insertions, 8 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 1585d976b3..70af2f63b6 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -3,7 +3,7 @@
legacy_header_height="18"
background_visible="true"
follows="left|top|right|bottom"
- height="359"
+ height="369"
layout="topleft"
left="0"
name="panel_im"
@@ -14,10 +14,10 @@
visible="true"
width="520"
can_resize="true"
- min_width="200"
- min_height="150">
+ min_width="350"
+ min_height="350">
<layout_stack follows="left|top|right|bottom"
- height="344"
+ height="354"
width="520"
layout="topleft"
orientation="horizontal"
@@ -28,12 +28,12 @@
name="panel_im_control_panel"
layout="topleft"
top_delta="-3"
- height="344"
+ height="354"
follows="left"
label="IM Control Panel"
auto_resize="false"
user_resize="false" />
- <layout_panel height="344"
+ <layout_panel height="354"
width="355"
left_delta="146"
top="0"
@@ -56,7 +56,7 @@
length="1"
follows="left|top|right|bottom"
font="SansSerif"
- height="290"
+ height="300"
layout="topleft"
name="chat_history"
parse_highlights="true"
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 f77a2ec730..c8b134cdf0 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
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
border="false"
- height="327"
+ height="350"
name="panel_im_control_panel"
width="131">
@@ -13,6 +13,16 @@
top="-10"
width="125"/>
+ <text
+ follows="left|right"
+ font="SansSerifBig"
+ height="16"
+ layout="topleft"
+ name="avatar_name"
+ use_ellipses="true"
+ value="Unknown"
+ width="125" />
+
<button
follows="left|bottom"
height="20"