diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-31 11:02:24 -0700 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-31 11:02:24 -0700 |
| commit | b39dd46bf3e1c1ccdffe9b4ac4e9ad68b0c3cd69 (patch) | |
| tree | 46e20f39ef94514de3f93a98aba75ad627209e84 /indra/newview/llsyswellwindow.cpp | |
| parent | 5d99b221fa8ea75b128e3cc771ed91baa8b11311 (diff) | |
| parent | e86adb53f4df0cb0b9d8ea9b6cc805782d9fcf71 (diff) | |
merge changes for storm-1673
Diffstat (limited to 'indra/newview/llsyswellwindow.cpp')
| -rw-r--r-- | indra/newview/llsyswellwindow.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp index ffe864e220..3aa6a3b7e5 100644 --- a/indra/newview/llsyswellwindow.cpp +++ b/indra/newview/llsyswellwindow.cpp @@ -203,10 +203,9 @@ void LLSysWellWindow::reshapeWindow() { new_window_height = MAX_WINDOW_HEIGHT; } - S32 newY = curRect.mTop + new_window_height - curRect.getHeight(); - S32 newWidth = curRect.getWidth() < MIN_WINDOW_WIDTH ? MIN_WINDOW_WIDTH - : curRect.getWidth(); - curRect.setLeftTopAndSize(curRect.mLeft, newY, newWidth, new_window_height); + S32 newWidth = curRect.getWidth() < MIN_WINDOW_WIDTH ? MIN_WINDOW_WIDTH : curRect.getWidth(); + + curRect.setLeftTopAndSize(curRect.mLeft, curRect.mTop, newWidth, new_window_height); reshape(curRect.getWidth(), curRect.getHeight(), TRUE); setRect(curRect); } |