diff options
| author | Richard Linden <none@none> | 2012-01-19 19:41:15 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-19 19:41:15 -0800 |
| commit | 9de0b5ed4891dcfcb54e35d9bb0401309455d66a (patch) | |
| tree | bcaceba3d020964cdd1f91353e61d3352c051554 /indra/llui/llwindowshade.cpp | |
| parent | 216ac700431af0ab7ee45ec5fef03c928f235063 (diff) | |
| parent | a662b888ed02691b7790c23e31c7d8bcf7cf7f5b (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge/
Diffstat (limited to 'indra/llui/llwindowshade.cpp')
| -rw-r--r-- | indra/llui/llwindowshade.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llwindowshade.cpp b/indra/llui/llwindowshade.cpp index 48a232c33e..f5c463c961 100644 --- a/indra/llui/llwindowshade.cpp +++ b/indra/llui/llwindowshade.cpp @@ -160,7 +160,7 @@ void LLWindowShade::draw() notification_area->reshape(notification_area->getRect().getWidth(), llclamp(message_rect.getHeight() + 15, - llmin(mFormHeight, MAX_NOTIFICATION_AREA_HEIGHT), + llmax(mFormHeight, MIN_NOTIFICATION_AREA_HEIGHT), MAX_NOTIFICATION_AREA_HEIGHT)); LLUICtrl::draw(); |