From 566d70a6d1c39fa4a68c3167b2f9b91592e2187f Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Sun, 2 Sep 2012 06:39:50 +0200 Subject: [PATCH] Restore applying anti-aliasing from preferences --- indra/newview/llpaneldisplay.cpp | 6 +++++- .../skins/default/xui/en-us/panel_preferences_graphics1.xml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/indra/newview/llpaneldisplay.cpp b/indra/newview/llpaneldisplay.cpp index 1e2eccdca..45214ca05 100644 --- a/indra/newview/llpaneldisplay.cpp +++ b/indra/newview/llpaneldisplay.cpp @@ -876,6 +876,10 @@ void LLPanelDisplay::cancel() void LLPanelDisplay::apply() { + U32 fsaa_value = childGetValue("fsaa").asInteger(); + bool apply_fsaa_change = !LLRenderTarget::sUseFBO && (mFSAASamples != fsaa_value); + gSavedSettings.setU32("RenderFSAASamples", fsaa_value); + applyResolution(); // Only set window size if we're not in fullscreen mode @@ -887,7 +891,7 @@ void LLPanelDisplay::apply() // Hardware tab //Still do a bit of voodoo here. V2 forces restart to change FSAA with FBOs off. //Let's not do that, and instead do pre-V2 FSAA change handling for that particular case - if(!LLRenderTarget::sUseFBO && (mFSAASamples != (U32)childGetValue("fsaa").asInteger())) + if(apply_fsaa_change) { bool logged_in = (LLStartUp::getStartupState() >= STATE_STARTED); LLWindow* window = gViewerWindow->getWindow(); diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml index 5393ca535..ce4cf97d9 100644 --- a/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml @@ -112,7 +112,7 @@ Antialiasing: - + Disabled 2x 4x