summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorcallum <none@none>2010-09-28 16:52:56 -0700
committercallum <none@none>2010-09-28 16:52:56 -0700
commit95ecad54c6f037910a5a22f7ef30026cf628fe80 (patch)
treeca8055be7f79fea005360306f2dda3ecce79a739 /indra/newview/llviewerwindow.cpp
parent594a115c92a84c90d1dbcc393b2ee7a189644f5f (diff)
EXP-112 Enable fullscreen mode (with mode switch, not resize to desktop) as per 1.x viewer.
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rw-r--r--indra/newview/llviewerwindow.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index fb43b51deb..ea32adf5b6 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1349,8 +1349,17 @@ LLViewerWindow::LLViewerWindow(
if (!LLAppViewer::instance()->restoreErrorTrap())
{
LL_WARNS("Window") << " Someone took over my signal/exception handler (post createWindow)!" << LL_ENDL;
- }
+ }
+
+ LLCoordScreen scr;
+ mWindow->getSize(&scr);
+ if(fullscreen && ( scr.mX!=width || scr.mY!=height))
+ {
+ llwarns << "Fullscreen has forced us in to a different resolution now using "<<scr.mX<<" x "<<scr.mY<<llendl;
+ gSavedSettings.setS32("FullScreenWidth",scr.mX);
+ gSavedSettings.setS32("FullScreenHeight",scr.mY);
+ }
if (NULL == mWindow)
{