diff options
| author | Richard Linden <none@none> | 2011-11-14 15:39:41 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-11-14 15:39:41 -0800 |
| commit | 3c5cdd2948d4c215d70a86a1cab12ae55d3958b9 (patch) | |
| tree | de94b58ecd23ef5d8e4304602dc8b55a1cc96bd6 /indra/llwindow/llwindow.cpp | |
| parent | 7766ccb7731a596d6716e9d0def90b3d7da5fcf3 (diff) | |
| parent | 98755a62bb414f23919e003101153c20d3ab3f72 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
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() { |