diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-02-11 10:38:34 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-02-11 10:38:34 +0200 |
| commit | de7ca5abb26930025b16c7f50aa7469c3b33c09e (patch) | |
| tree | 40474e1e2ee190cae30603ce960e58238929c445 /indra/newview/skins | |
| parent | b0af6b8acb33c86e5ac8d693131b5c9e7d9407b5 (diff) | |
| parent | 0e035fd9b8090c59cc7388809ebe0bf25b54cd9d (diff) | |
Merge. Note: changeset b048156543b6 (Fixed normal bug EXT - 5104) was initially commited into default branch by mistake
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_im_control_panel.xml | 11 |
1 files changed, 1 insertions, 10 deletions
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 c7e5b25e06..28c4adf67c 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 @@ -11,15 +11,6 @@ name="avatar_icon" top="-5" width="105"/> - <text - follows="top|left|right" - font="SansSerifLarge" - height="19" - layout="topleft" - name="avatar_name" - use_ellipses="true" - value="Unknown" - width="110" /> <layout_stack mouse_opaque="false" border_size="0" @@ -30,7 +21,7 @@ left="5" name="button_stack" orientation="vertical" - top_pad="-5" + top_pad="5" width="105"> <layout_panel mouse_opaque="false" |