diff options
| author | callum <none@none> | 2011-11-11 12:29:04 -0800 |
|---|---|---|
| committer | callum <none@none> | 2011-11-11 12:29:04 -0800 |
| commit | e4e4977f5eab5aac24c32b569c5273c4be926cb2 (patch) | |
| tree | 93fc0900f80be0660cdd1e33c108aad7ce135a09 /indra/llwindow/llwindow.h | |
| parent | 1b56b7d2e5ad2b5c4ca2c733b25d1fd7dc78f634 (diff) | |
EXP-1527 FIX Debug values for windowwidth and windowheight can be set below minimum required values
and
EXP-1528 Launching viewer with a settings.xml file with windowwidth and windowheight set below minimum values, launches to those values not minimum window size
Diffstat (limited to 'indra/llwindow/llwindow.h')
| -rw-r--r-- | indra/llwindow/llwindow.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h index e8a86a1880..b2c2628ec4 100644 --- a/indra/llwindow/llwindow.h +++ b/indra/llwindow/llwindow.h @@ -73,6 +73,7 @@ public: virtual BOOL getSize(LLCoordWindow *size) = 0; virtual BOOL setPosition(LLCoordScreen position) = 0; virtual BOOL setSize(LLCoordScreen size) = 0; + virtual void setMinSize(U32 min_width, U32 min_height); virtual BOOL switchContext(BOOL fullscreen, const LLCoordScreen &size, BOOL disable_vsync, const LLCoordScreen * const posp = NULL) = 0; virtual BOOL setCursorPosition(LLCoordWindow position) = 0; virtual BOOL getCursorPosition(LLCoordWindow *position) = 0; @@ -188,6 +189,8 @@ protected: BOOL mHideCursorPermanent; U32 mFlags; U16 mHighSurrogate; + U32 mMinWindowWidth; + U32 mMinWindowHeight; // Handle a UTF-16 encoding unit received from keyboard. // Converting the series of UTF-16 encoding units to UTF-32 data, |