summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindow.h
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-11-11 23:59:48 -0800
committerMerov Linden <merov@lindenlab.com>2011-11-11 23:59:48 -0800
commitd8e1b48328017eba1c68bcc56a4f67085643988a (patch)
tree9ac0775a19eb7d76f9f88c5a177aeb6d41044cfe /indra/llwindow/llwindow.h
parentdb371c98248b790eed22a6295d33dd1d02adc602 (diff)
parent8ff29a9e84b37e8962c4f485e0e1d678793f718e (diff)
Pull from viewer-experience
Diffstat (limited to 'indra/llwindow/llwindow.h')
-rw-r--r--indra/llwindow/llwindow.h3
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,