1 files changed, 11 insertions, 61 deletions

diff --git a/linden/indra/newview/llpaneldisplay.cpp b/linden/indra/newview/llpaneldisplay.cpp
index 3e60745..d510775 100644
--- a/linden/indra/newview/llpaneldisplay.cpp
+++ b/linden/indra/newview/llpaneldisplay.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -753,6 +753,8 @@ void LLPanelDisplay::onApplyResolution(LLUICtrl* src, void* user_data)
 
 void LLPanelDisplay::applyResolution()
 {
+
+        gGL.flush();
         char aspect_ratio_text[ASPECT_RATIO_STR_LEN];           /*Flawfinder: ignore*/
         if (mCtrlAspectRatio->getCurrentIndex() == -1)
         {
@@ -787,75 +789,23 @@ void LLPanelDisplay::applyResolution()
         {
                 mAspectRatio = (F32)mCtrlAspectRatio->getValue().asReal();
         }
-
+        
         // presumably, user entered a non-numeric value if aspect_ratio == 0.f
         if (mAspectRatio != 0.f)
         {
                 mAspectRatio = llclamp(mAspectRatio, 0.2f, 5.f);
                 gSavedSettings.setF32("FullScreenAspectRatio", mAspectRatio);
-                if (gSavedSettings.getBOOL("FullScreenAutoDetectAspectRatio"))
-                {
-                        gViewerWindow->getWindow()->setNativeAspectRatio(0.f);
-                }
-                else
-                {
-                        gViewerWindow->getWindow()->setNativeAspectRatio(mAspectRatio);
-                }
         }
-        gViewerWindow->reshape(gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight());
-
+        
         // Screen resolution
         S32 num_resolutions;
-        LLWindow::LLWindowResolution* supported_resolutions = gViewerWindow->getWindow()->getSupportedResolutions(num_resolutions);
-
-        // switching to windowed
-        BOOL fullscreen = !mCtrlWindowed->get();
-
-        // check if resolution has changed
-        BOOL targetFullscreen;
-        S32 targetWidth;
-        S32 targetHeight;
-        
-        gViewerWindow->getTargetWindow(targetFullscreen, targetWidth, targetHeight);
+        LLWindow::LLWindowResolution* supported_resolutions = 
+                gViewerWindow->getWindow()->getSupportedResolutions(num_resolutions);
+        U32 resIndex = mCtrlFullScreen->getCurrentIndex();
+        gSavedSettings.setS32("FullScreenWidth", supported_resolutions[resIndex].mWidth);
+        gSavedSettings.setS32("FullScreenHeight", supported_resolutions[resIndex].mHeight);
 
-        if ((fullscreen != targetFullscreen) ||
-                (fullscreen &&
-                 (supported_resolutions[mCtrlFullScreen->getCurrentIndex()].mWidth != targetWidth ||
-                  supported_resolutions[mCtrlFullScreen->getCurrentIndex()].mHeight != targetHeight)
-                 ))
-        {
-                // change fullscreen resolution or switch in/out of windowed mode
-                BOOL result;
-
-                BOOL logged_in = (LLStartUp::getStartupState() >= STATE_STARTED);
-                if (fullscreen)
-                {
-                        result = gViewerWindow->changeDisplaySettings(TRUE, 
-                                LLCoordScreen(  supported_resolutions[mCtrlFullScreen->getCurrentIndex()].mWidth, 
-                                                                supported_resolutions[mCtrlFullScreen->getCurrentIndex()].mHeight), 
-                                gSavedSettings.getBOOL("DisableVerticalSync"),
-                                logged_in);
-                }
-                else
-                {
-                        result = gViewerWindow->changeDisplaySettings(FALSE, 
-                                LLCoordScreen(gSavedSettings.getS32("WindowWidth"), gSavedSettings.getS32("WindowHeight")), 
-                                TRUE,
-                                logged_in);
-                }
-                if (!result)
-                {
-
-                        // GL is non-existent at this point, so we can't continue.
-                        llerrs << "LLPanelDisplay::apply() failed" << llendl;
-                }
-        }
-
-        // force aspect ratio
-        if (fullscreen)
-        {
-                LLViewerCamera::getInstance()->setAspect( gViewerWindow->getDisplayAspectRatio() );
-        }
+        gViewerWindow->requestResolutionUpdate(!mCtrlWindowed->get());
 
         send_agent_update(TRUE);