summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowwin32.cpp
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/llwindowwin32.cpp
parentdb371c98248b790eed22a6295d33dd1d02adc602 (diff)
parent8ff29a9e84b37e8962c4f485e0e1d678793f718e (diff)
Pull from viewer-experience
Diffstat (limited to 'indra/llwindow/llwindowwin32.cpp')
-rw-r--r--indra/llwindow/llwindowwin32.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index a84bd5fb08..06360d261f 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -2363,8 +2363,8 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
case WM_GETMINMAXINFO:
{
LPMINMAXINFO min_max = (LPMINMAXINFO)l_param;
- min_max->ptMinTrackSize.x = 1024;
- min_max->ptMinTrackSize.y = 768;
+ min_max->ptMinTrackSize.x = window_imp->mMinWindowWidth;
+ min_max->ptMinTrackSize.y = window_imp->mMinWindowHeight;
return 0;
}