diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-10-12 15:52:03 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-10-12 15:52:03 -0700 |
commit | d3422c8d9e90f8c5ea675b470f425b13ed602654 (patch) | |
tree | 6c154dfca958e33c327834427fe8afaba6270af0 /indra/newview/llfloaterhardwaresettings.cpp | |
parent | 0f7ca61386e4cf0f9efda7c380c40cc608f26ea3 (diff) | |
parent | a8fbfa40ba6153668e1f713ae0e128224b4f400f (diff) |
Merge
Diffstat (limited to 'indra/newview/llfloaterhardwaresettings.cpp')
-rw-r--r-- | indra/newview/llfloaterhardwaresettings.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llfloaterhardwaresettings.cpp b/indra/newview/llfloaterhardwaresettings.cpp index 77af054522..7bf158488f 100644 --- a/indra/newview/llfloaterhardwaresettings.cpp +++ b/indra/newview/llfloaterhardwaresettings.cpp @@ -101,7 +101,13 @@ void LLFloaterHardwareSettings::refreshEnabledState() getChildView("gamma")->setEnabled(!gPipeline.canUseWindLightShaders()); getChildView("(brightness, lower is brighter)")->setEnabled(!gPipeline.canUseWindLightShaders()); getChildView("fog")->setEnabled(!gPipeline.canUseWindLightShaders()); - + getChildView("fsaa")->setEnabled(gPipeline.canUseAntiAliasing()); + /* Enable to reset fsaa value to disabled when feature is not available. + if (!gPipeline.canUseAntiAliasing()) + { + getChild<LLUICtrl>("fsaa")->setValue((LLSD::Integer) 0); + } + */ } //============================================================================ |