diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-10-12 08:20:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-12 08:20:00 +0000 |
| commit | 276e80ce367dd89d7f3b2882ff669d6b59b78c0c (patch) | |
| tree | 79cc5cc69281cd89c668e3b9941cc7d92d53445f /indra/newview/llchatitemscontainerctrl.cpp | |
| parent | c2ddcfae49bb1b4794facd64de1c2ac62fdb5715 (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1967 https://svn.aws.productengine.com/secondlife/pe/stable-2@1971 -> viewer-2.0.0-3
* Bugs: EXT-1431 EXT-1237 EXT-1151 EXT-1165 EXT-1410 EXT-1419
* Dev: EXT-1232
Diffstat (limited to 'indra/newview/llchatitemscontainerctrl.cpp')
| -rw-r--r-- | indra/newview/llchatitemscontainerctrl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp index 25620c2aed..63b9fd8e66 100644 --- a/indra/newview/llchatitemscontainerctrl.cpp +++ b/indra/newview/llchatitemscontainerctrl.cpp @@ -59,6 +59,7 @@ static const F32 AUTO_SCROLL_RATE_ACCEL = 120.f; static const S32 msg_left_offset = 30; static const S32 msg_right_offset = 10; +static const S32 msg_height_pad = 2; //static LLDefaultChildRegistry::Register<LLChatItemsContainerCtrl> t2("chat_items_container"); @@ -178,14 +179,14 @@ void LLNearbyChatToastPanel::setMessage (const LLChat& chat_msg) void LLNearbyChatToastPanel::snapToMessageHeight () { LLChatMsgBox* text_box = getChild<LLChatMsgBox>("msg_text", false); - S32 new_height = text_box->getTextPixelHeight(); + S32 new_height = text_box->getTextPixelHeight() + msg_height_pad; LLRect panel_rect = getRect(); S32 caption_height = 0; LLPanel* caption = getChild<LLPanel>("msg_caption", false); caption_height = caption->getRect().getHeight(); - panel_rect.setLeftTopAndSize( panel_rect.mLeft, panel_rect.mTop, panel_rect.getWidth() , caption_height + new_height); + panel_rect.setLeftTopAndSize( panel_rect.mLeft, panel_rect.mTop, panel_rect.getWidth(), caption_height + new_height); reshape( getRect().getWidth(), caption_height + new_height, 1); |