diff options
author | Dave Parks <davep@lindenlab.com> | 2010-10-21 14:25:15 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2010-10-21 14:25:15 -0500 |
commit | 218d37d859dab49fd6810e47480ed6bc5b517270 (patch) | |
tree | 71190523e1b9434c0334003af23e1011406ba0aa /indra/newview/llfloaterhardwaresettings.cpp | |
parent | ae5cf3cefaf6bf25f4478611505cbd58c5a3b112 (diff) | |
parent | 2504824d59c32cf3372cf6d15808914ada2b051c (diff) |
merge
Diffstat (limited to 'indra/newview/llfloaterhardwaresettings.cpp')
-rw-r--r-- | indra/newview/llfloaterhardwaresettings.cpp | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/indra/newview/llfloaterhardwaresettings.cpp b/indra/newview/llfloaterhardwaresettings.cpp index 3cd3c74ee4..dc573e1433 100644 --- a/indra/newview/llfloaterhardwaresettings.cpp +++ b/indra/newview/llfloaterhardwaresettings.cpp @@ -129,30 +129,6 @@ BOOL LLFloaterHardwareSettings::postBuild() void LLFloaterHardwareSettings::apply() { - // Anisotropic rendering - BOOL old_anisotropic = LLImageGL::sGlobalUseAnisotropic; - LLImageGL::sGlobalUseAnisotropic = getChild<LLUICtrl>("ani")->getValue(); - - U32 fsaa = (U32) getChild<LLUICtrl>("fsaa")->getValue().asInteger(); - U32 old_fsaa = gSavedSettings.getU32("RenderFSAASamples"); - - BOOL logged_in = (LLStartUp::getStartupState() >= STATE_STARTED); - - if (old_fsaa != fsaa) - { - gSavedSettings.setU32("RenderFSAASamples", fsaa); - LLWindow* window = gViewerWindow->getWindow(); - LLCoordScreen size; - window->getSize(&size); - gViewerWindow->changeDisplaySettings(size, - gSavedSettings.getBOOL("DisableVerticalSync"), - logged_in); - } - else if (old_anisotropic != LLImageGL::sGlobalUseAnisotropic) - { - gViewerWindow->restartDisplay(logged_in); - } - refresh(); } |