diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-17 14:33:43 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-17 14:33:43 +0200 |
| commit | 2105e9c716458e64209cce29a15c6ad45d4d6f6d (patch) | |
| tree | 5867028e1606a473ca2e2f295c48daa2e5b35178 /indra/newview/llsyswellwindow.cpp | |
| parent | 4c623cb7bb952ed034ce0457fef29c535ca8807e (diff) | |
| parent | d43e33400a2ef9d89ed6d13067055b5b1edbde78 (diff) | |
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llsyswellwindow.cpp')
| -rw-r--r-- | indra/newview/llsyswellwindow.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp index eada387945..04ecf769d5 100644 --- a/indra/newview/llsyswellwindow.cpp +++ b/indra/newview/llsyswellwindow.cpp @@ -332,7 +332,9 @@ void LLSysWellWindow::reshapeWindow() new_window_height = MAX_WINDOW_HEIGHT; } S32 newY = curRect.mTop + new_window_height - curRect.getHeight(); - curRect.setLeftTopAndSize(curRect.mLeft, newY, MIN_WINDOW_WIDTH, new_window_height); + S32 newWidth = curRect.getWidth() < MIN_WINDOW_WIDTH ? MIN_WINDOW_WIDTH + : curRect.getWidth(); + curRect.setLeftTopAndSize(curRect.mLeft, newY, newWidth, new_window_height); reshape(curRect.getWidth(), curRect.getHeight(), TRUE); setRect(curRect); |