summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterhardwaresettings.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-10-11 17:37:59 -0400
committerLoren Shih <seraph@lindenlab.com>2010-10-11 17:37:59 -0400
commit3a4e38efa6547a989b19f3fb1195901571884f87 (patch)
treef8eecb083ad296fcc0e8ceabc60e4ab3639625d3 /indra/newview/llfloaterhardwaresettings.cpp
parentac6149314e8b8c1f924504969c8a3f7617c7c6a9 (diff)
SH-280 FIXED Anti-aliasing broken
SH-287 FIXED Anti-aliasing setting does not take effect until relog Added logic to control RenderUseFBO setting based on graphics quality. RenderUseFBO controls whether anti-aliasing is enabled.
Diffstat (limited to 'indra/newview/llfloaterhardwaresettings.cpp')
-rw-r--r--indra/newview/llfloaterhardwaresettings.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llfloaterhardwaresettings.cpp b/indra/newview/llfloaterhardwaresettings.cpp
index 2985626bd7..0e89ca966a 100644
--- a/indra/newview/llfloaterhardwaresettings.cpp
+++ b/indra/newview/llfloaterhardwaresettings.cpp
@@ -102,7 +102,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);
+ }
+ */
}
//============================================================================