diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-27 11:43:48 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-27 11:43:48 +0200 |
| commit | bc57c73814db2297f17e2c6497a3ae8562bf845c (patch) | |
| tree | a8ef0bc4f8cd19a7978f04e867476d210a439b5c /indra/newview/skins/default/xui/en | |
| parent | e8421572d01640f1fac0d8a0f04c85db35fe3b51 (diff) | |
| parent | 4441b83e3304baad458be13a36a4f676269c9ded (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_voice_controls.xml | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_group_control_panel.xml | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml index 2f13b51a9f..4434fe7403 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml @@ -25,13 +25,13 @@ <avatar_icon enabled="false" follows="left|top" - height="20" - image_name="icon_avatar_online.tga" + height="18" + image_name="Generic_Person" layout="topleft" left="0" name="user_icon" top="0" - width="20" /> + width="18" /> <text follows="top|left" font="SansSerifSmallBold" 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 41b210557e..889f29fc53 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 @@ -61,7 +61,6 @@ width="125"/> <button - enabled="false" bottom="10" follows="all" height="20" |