diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-02-05 21:13:06 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-02-05 21:13:06 -0800 |
| commit | dadc5e84e189bca043870b192db7b8607d1d9daf (patch) | |
| tree | a1f9a1cd172f4becf4c8dea21f27d51eed79f004 /indra/newview/lltoastpanel.cpp | |
| parent | 2aee8f6fbe2be3196300dd1ee6e31039de089207 (diff) | |
| parent | 85f7f43069ea7ea47b4461fa1d7700339985ab35 (diff) | |
Pull merge from lindenlab/viewer-chui
Diffstat (limited to 'indra/newview/lltoastpanel.cpp')
| -rw-r--r-- | indra/newview/lltoastpanel.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/lltoastpanel.cpp b/indra/newview/lltoastpanel.cpp index 54d3912136..187aee207c 100644 --- a/indra/newview/lltoastpanel.cpp +++ b/indra/newview/lltoastpanel.cpp @@ -81,9 +81,7 @@ void LLToastPanel::snapToMessageHeight(LLTextBase* message, S32 maxLineCount) S32 newTextHeight = llmin(requiredTextHeight, maxTextHeight); heightDelta = newTextHeight - oldTextHeight; - S32 new_panel_height = llmin( - llmax(getRect().getHeight() + heightDelta, MIN_PANEL_HEIGHT), - maxTextHeight); + S32 new_panel_height = llmax(getRect().getHeight() + heightDelta, MIN_PANEL_HEIGHT); //reshape the panel with new height if (new_panel_height != getRect().getHeight()) |