diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-09-17 21:02:51 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-09-17 21:02:51 -0700 |
| commit | 97cce3d34f21fea8eb6c259e04480c269e8ada28 (patch) | |
| tree | 2af8a73a5699286ace5e1c79f82e4b1a2b757cd6 /indra/newview | |
| parent | d22c8510b19f12e81dc68562de45c2c364036440 (diff) | |
| parent | 0196ac131a409991adec862b67c93d658f4537ce (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llimfloatercontainer.cpp | 4 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index 76bd6b14b9..4e0fba9502 100755 --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -824,8 +824,8 @@ LLConversationViewParticipant* LLIMFloaterContainer::createConversationViewParti params.root = mConversationsRoot; 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); + //24 is the the current hight of an item (itemHeight) loaded from conversation_view_participant.xml. + 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" |