diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-18 12:15:51 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-18 12:15:51 -0700 |
| commit | 3c8407f32cf947ee1631ed66bba7a676e8b3b670 (patch) | |
| tree | 63c9d3f6efcaf0630be8fa67c2484cad3e8cf080 /indra/newview/skins/default | |
| parent | 0196ac131a409991adec862b67c93d658f4537ce (diff) | |
CHUI-283: Now the avatar icon loads in the user's avatar image.Also the avatar image is of proper size. The participant of the conversation is offset correctly as well.
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_pathfinding_console.xml | 2 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml index 2629313069..79f2027c31 100644 --- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml @@ -152,7 +152,7 @@ </text> <check_box height="19" - label="World" + label="Test" layout="topleft" name="show_world" top_pad="4" diff --git a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml index b00e8aaeee..7ddcfe3b03 100755 --- a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml +++ b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml @@ -1,13 +1,19 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <conversation_view_participant folder_arrow_image="ForSale_Badge" - folder_indentation="8" + folder_indentation="0" item_height="24" item_top_pad="4" selection_image="Rounded_Square" mouse_opaque="true" follows="left|top|right" > +<avatar_icon + follows="left" + height="20" + default_icon_name="Generic_Person" + left="50" + width="20" /> <info_button follows="right" height="16" |