diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-11-11 23:59:48 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-11-11 23:59:48 -0800 |
| commit | d8e1b48328017eba1c68bcc56a4f67085643988a (patch) | |
| tree | 9ac0775a19eb7d76f9f88c5a177aeb6d41044cfe /indra/llwindow/llwindow.cpp | |
| parent | db371c98248b790eed22a6295d33dd1d02adc602 (diff) | |
| parent | 8ff29a9e84b37e8962c4f485e0e1d678793f718e (diff) | |
Pull from viewer-experience
Diffstat (limited to 'indra/llwindow/llwindow.cpp')
| -rw-r--r-- | indra/llwindow/llwindow.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp index dc3a1099b1..a313885ca3 100644 --- a/indra/llwindow/llwindow.cpp +++ b/indra/llwindow/llwindow.cpp @@ -111,6 +111,8 @@ LLWindow::LLWindow(LLWindowCallbacks* callbacks, BOOL fullscreen, U32 flags) mCursorHidden(FALSE), mBusyCount(0), mIsMouseClipping(FALSE), + mMinWindowWidth(1024), // just a sanity check - actual minimum size is stored in settings.xml + mMinWindowHeight(768), mSwapMethod(SWAP_METHOD_UNDEFINED), mHideCursorPermanent(FALSE), mFlags(flags), @@ -179,6 +181,13 @@ void *LLWindow::getMediaWindow() return getPlatformWindow(); } +// virtual +void LLWindow::setMinSize(U32 min_width, U32 min_height) +{ + mMinWindowWidth = min_width; + mMinWindowHeight = min_height; +} + //virtual void LLWindow::processMiscNativeEvents() { |