diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-20 15:40:43 -0500 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-20 15:40:43 -0500 |
| commit | 6298daf266369dbd3600c5fdf287f9c680b2a897 (patch) | |
| tree | 270a7d6d12e444d739b85ad9d89e0001621b20a2 /indra/llwindow/llwindow.cpp | |
| parent | 7c0b98aa83faacf27da2b71e186399e232a1a376 (diff) | |
| parent | 0915ce7834f8e36c53e0790c2946b952a12a74c6 (diff) | |
merge
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); } |