diff options
author | leyla_linden <none@none> | 2010-12-03 15:44:39 -0800 |
---|---|---|
committer | leyla_linden <none@none> | 2010-12-03 15:44:39 -0800 |
commit | 35c67ca7fb9964ee3eabeb66ec441ded94256951 (patch) | |
tree | e70ab4204e8284f201ada83dca884ad8091146bb /indra/newview/llfloaterpreference.cpp | |
parent | 35d50fe36e83a0b76816c693dc89219041393ae5 (diff) | |
parent | 32db8988ffab8778de106dc769228089bec8aad1 (diff) |
Merge
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
-rw-r--r-- | indra/newview/llfloaterpreference.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 6a7b5171b5..b969ba29da 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -938,8 +938,7 @@ void LLFloaterPreference::refreshEnabledState() //Deferred/SSAO/Shadows LLCheckBoxCtrl* ctrl_deferred = getChild<LLCheckBoxCtrl>("UseLightShaders"); - if (LLFeatureManager::getInstance()->isFeatureAvailable("RenderUseFBO") && - LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") && + if (LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") && shaders) { BOOL enabled = (ctrl_wind_light->get()) ? TRUE : FALSE; |