diff options
| author | Cho <cho@lindenlab.com> | 2013-01-25 22:56:35 +0000 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-01-25 22:56:35 +0000 |
| commit | 427725c2a6d5c50468e7579a4d3b92795425723f (patch) | |
| tree | 59def37a836e261e1c1a7027a450e59785f25fc3 /indra/newview/lltoastpanel.cpp | |
| parent | 9312cd8709132835878bdbe17f81d1b3e9fa7f45 (diff) | |
| parent | daa9db305a5ae2c0c5b0c2425d6482de6dee7b2c (diff) | |
merging latest changes
Diffstat (limited to 'indra/newview/lltoastpanel.cpp')
| -rw-r--r-- | indra/newview/lltoastpanel.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lltoastpanel.cpp b/indra/newview/lltoastpanel.cpp index 187aee207c..54d3912136 100644 --- a/indra/newview/lltoastpanel.cpp +++ b/indra/newview/lltoastpanel.cpp @@ -81,7 +81,9 @@ void LLToastPanel::snapToMessageHeight(LLTextBase* message, S32 maxLineCount) S32 newTextHeight = llmin(requiredTextHeight, maxTextHeight); heightDelta = newTextHeight - oldTextHeight; - S32 new_panel_height = llmax(getRect().getHeight() + heightDelta, MIN_PANEL_HEIGHT); + S32 new_panel_height = llmin( + llmax(getRect().getHeight() + heightDelta, MIN_PANEL_HEIGHT), + maxTextHeight); //reshape the panel with new height if (new_panel_height != getRect().getHeight()) |