diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-14 18:47:39 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-14 18:47:39 -0700 |
| commit | 399ba09c08d8ccaf9b34daa8b743f837639b2f35 (patch) | |
| tree | 30c4599c036db22318abe23c39c55f7e2fc54ef6 /indra/newview | |
| parent | 9d73cac97eea835740ada2aac95ea79afabff34a (diff) | |
CHUI-283: Now the info/speaker icon are better positioned within the participant item. Also the participant item now matches the height of the session (conversation) item.
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llimfloatercontainer.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index 54a40627fb..e039702683 100755 --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -721,7 +721,7 @@ LLConversationViewParticipant* LLIMFloaterContainer::createConversationViewParti params.listener = item; //16 and panel_rect.getWidth() are used since that is currently the values used in repositioningWidgets() - params.rect = LLRect (0, 16, panel_rect.getWidth(), 0); + params.rect = LLRect (0, 24, panel_rect.getWidth(), 0); params.tool_tip = params.name; params.participant_id = item->getUUID(); 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 60015576b5..b00e8aaeee 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 @@ -2,7 +2,7 @@ <conversation_view_participant folder_arrow_image="ForSale_Badge" folder_indentation="8" - item_height="20" + item_height="24" item_top_pad="4" selection_image="Rounded_Square" mouse_opaque="true" @@ -10,11 +10,9 @@ > <info_button follows="right" - auto_update="true" height="16" image_pressed="Info_Press" image_unselected="Info_Over" - layout="topleft" right="-28" name="info_btn" width="16" /> @@ -23,7 +21,6 @@ auto_update="true" draw_border="false" height="16" - layout="topleft" right="-3" mouse_opaque="true" name="speaking_indicator" |