diff options
| author | angela <angela@lindenlab.com> | 2009-11-19 11:43:47 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-19 11:43:47 +0800 |
| commit | 6e5f529a7adb53fa021986aed6e6b1b229cc0efd (patch) | |
| tree | a031044cfb6618a5b36a0e80d0fc3a918dfa07a9 /indra/newview/llsyswellwindow.cpp | |
| parent | a35fbddb910fa0dd068622c3dc64af1b27ca19b7 (diff) | |
| parent | 81eca4a7823f7fa06327b8185b6603d1f3c9ac9a (diff) | |
branch merge
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 95fed37c30..539536b527 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); |