summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindow.h
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-12-02 12:33:51 -0800
committerLeslie Linden <leslie@lindenlab.com>2011-12-02 12:33:51 -0800
commitef0552a090123974682790afdafec68218578113 (patch)
treea67ef723145d4d646289354918dd008412ab6eb3 /indra/llwindow/llwindow.h
parent4d14bb02b908c37f73e915af811027c1d193b667 (diff)
EXP-1642 FIX -- Viewer crash on startup on Mac
Minimum window size setting no longer forces propagation to the OS before root view is initialized.
Diffstat (limited to 'indra/llwindow/llwindow.h')
-rw-r--r--indra/llwindow/llwindow.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h
index 77a9e88287..ec41f24465 100644
--- a/indra/llwindow/llwindow.h
+++ b/indra/llwindow/llwindow.h
@@ -73,7 +73,7 @@ public:
virtual BOOL getSize(LLCoordWindow *size) = 0;
virtual BOOL setPosition(LLCoordScreen position) = 0;
BOOL setSize(LLCoordScreen size);
- virtual void setMinSize(U32 min_width, U32 min_height);
+ virtual void setMinSize(U32 min_width, U32 min_height, bool enforce_immediately = true);
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;