diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-01-08 10:48:26 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-01-08 10:48:26 -0500 |
| commit | 3763386987bd7ab42438a1f1bdf3a78283bcbf51 (patch) | |
| tree | b45814d100958d0adb07100440888c56200a5a9a /indra/llwindow/llwindow.cpp | |
| parent | 66555b844dfcdb1bbbab472967a90060c5d0838f (diff) | |
| parent | 757a955bd700eb4f838762dcbe789a77ee052064 (diff) | |
merge changes for vmrg-213
Diffstat (limited to 'indra/llwindow/llwindow.cpp')
| -rw-r--r-- | indra/llwindow/llwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp index 1351bed547..2e9e31bfea 100644 --- a/indra/llwindow/llwindow.cpp +++ b/indra/llwindow/llwindow.cpp @@ -186,8 +186,8 @@ BOOL LLWindow::setSize(LLCoordScreen size) { if (!getMaximized()) { - size.mX = llmin(size.mX, mMinWindowWidth); - size.mY = llmin(size.mY, mMinWindowHeight); + size.mX = llmax(size.mX, mMinWindowWidth); + size.mY = llmax(size.mY, mMinWindowHeight); } return setSizeImpl(size); } |