diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2010-03-18 16:37:41 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2010-03-18 16:37:41 +0200 |
| commit | 1adbea341dda1ef09c6aac2475af70313448d152 (patch) | |
| tree | ad8473cf58896d76d6bf619f343ebd99889f22ab /indra/newview | |
| parent | d856f1ea9516f6d852dca56f16e08266747e3e96 (diff) | |
| parent | ec3443cc858b911f06ef93057644e78085b9abdd (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 2384e6c5ba..5b521457e9 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -305,9 +305,7 @@ static std::string gLaunchFileOnQuit; // Used on Win32 for other apps to identify our window (eg, win_setup) const char* const VIEWER_WINDOW_CLASSNAME = "Second Life"; static const S32 FIRST_RUN_WINDOW_WIDTH = 1024; - -//should account for Windows task bar -static const S32 FIRST_RUN_WINDOW_HIGHT = 738; +static const S32 FIRST_RUN_WINDOW_HIGHT = 768; //---------------------------------------------------------------------------- // List of entries from strings.xml to always replace @@ -2388,7 +2386,7 @@ bool LLAppViewer::initWindow() window_width = FIRST_RUN_WINDOW_WIDTH;//yep hardcoded window_height = FIRST_RUN_WINDOW_HIGHT; - //if screen resolution is lower then first run width/height then show maximized + //if screen resolution is lower then 1024*768 then show maximized LLDisplayInfo display_info; if(display_info.getDisplayWidth() <= FIRST_RUN_WINDOW_WIDTH || display_info.getDisplayHeight()<=FIRST_RUN_WINDOW_HIGHT) |