summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llimfloatercontainer.cpp4
-rwxr-xr-xindra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml5
2 files changed, 3 insertions, 6 deletions
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp
index ab4b64471b..db0d760e3f 100755
--- a/indra/newview/llimfloatercontainer.cpp
+++ b/indra/newview/llimfloatercontainer.cpp
@@ -825,8 +825,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"