summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterhardwaresettings.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-10-11 18:30:22 -0700
committerMerov Linden <merov@lindenlab.com>2010-10-11 18:30:22 -0700
commita8fbfa40ba6153668e1f713ae0e128224b4f400f (patch)
treebc2210d3055fa2ee14da52a64f6f0cb478f80c60 /indra/newview/llfloaterhardwaresettings.cpp
parent48c2b2496d3ed6aeeebb0bc8950725f8ef7e305f (diff)
parent418cb8689f54def3377369842b3635ad28013374 (diff)
pull viewer-beta into viewer-development
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 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);
+ }
+ */
}
//============================================================================