From e4e4977f5eab5aac24c32b569c5273c4be926cb2 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Fri, 11 Nov 2011 12:29:04 -0800
Subject: 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

---
 indra/llwindow/llwindow.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'indra/llwindow/llwindow.cpp')

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()
 {
-- 
cgit v1.2.3