diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2012-01-04 14:06:36 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2012-01-04 14:06:36 -0800 |
| commit | 1c4474f8945316118870d7d8389d6bfb619ad239 (patch) | |
| tree | 0b9aa54bd789f94c9270600199738e7432366472 /indra/llwindow | |
| parent | 912833bafa9a59734432787158e36b66ee9586aa (diff) | |
| parent | 377a9ab9ac3b098492cbd010f3091c713ac6dc83 (diff) | |
Merge from viewer-experience
Diffstat (limited to 'indra/llwindow')
| -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); } |