livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for EXP-1777/EXP-1832: Viewer Size not persistent across logins

meow-7.2.2
Kadah_Coba 2012-02-16 17:10:05 -08:00
parent c0d05749f3
commit 43d3c2b5bd
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llviewerwindow.cpp
View File

@ -2209,7 +2209,12 @@ void LLViewerWindow::reshape(S32 width, S32 height)
BOOL maximized = mWindow->getMaximized();
gSavedSettings.setBOOL("WindowMaximized", maximized);
if (!maximized)
//<FS:KC - fix for EXP-1777/EXP-1832>
LLCoordScreen window_size;
if (!maximized
&& mWindow->getSize(&window_size))
// if (!maximized)
//</FS:KC - fix for EXP-1777/EXP-1832>
{
U32 min_window_width=gSavedSettings.getU32("MinWindowWidth");
U32 min_window_height=gSavedSettings.getU32("MinWindowHeight");
@ -2217,8 +2222,12 @@ void LLViewerWindow::reshape(S32 width, S32 height)
mWindow->setMinSize(min_window_width, min_window_height);
// Only save size if not maximized
gSavedSettings.setU32("WindowWidth", mWindowRectRaw.getWidth());
gSavedSettings.setU32("WindowHeight", mWindowRectRaw.getHeight());
//<FS:KC - fix for EXP-1777/EXP-1832>
// gSavedSettings.setU32("WindowWidth", mWindowRectRaw.getWidth());
// gSavedSettings.setU32("WindowHeight", mWindowRectRaw.getHeight());
gSavedSettings.setU32("WindowWidth", window_size.mX);
gSavedSettings.setU32("WindowHeight", window_size.mY);
//</FS:KC - fix for EXP-1777/EXP-1832>
}
LLViewerStats::getInstance()->setStat(LLViewerStats::ST_WINDOW_WIDTH, (F64)width);