summaryrefslogtreecommitdiff
path: root/indra/newview/llimfloatercontainer.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-09-17 21:02:51 -0700
committerMerov Linden <merov@lindenlab.com>2012-09-17 21:02:51 -0700
commit97cce3d34f21fea8eb6c259e04480c269e8ada28 (patch)
tree2af8a73a5699286ace5e1c79f82e4b1a2b757cd6 /indra/newview/llimfloatercontainer.cpp
parentd22c8510b19f12e81dc68562de45c2c364036440 (diff)
parent0196ac131a409991adec862b67c93d658f4537ce (diff)
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llimfloatercontainer.cpp')
-rwxr-xr-xindra/newview/llimfloatercontainer.cpp4
1 files changed, 2 insertions, 2 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();