diff options
| author | Tofu Buzzard <no-email> | 2011-02-08 15:49:45 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-08 15:49:45 -0800 |
| commit | 2f7c01097c43b2a46c02e169e0ab4d3eb5c3c9bb (patch) | |
| tree | 87f8f900d40a37bb8a731c8c2ccb45bc1eb6b37b /indra/newview/llfloaterpreference.cpp | |
| parent | 63e66901c4e21623ea5197874726d7d410f497ed (diff) | |
| parent | 8f9edd3874823fccf9f78e45c758bee951b56e1d (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 92d6d9a486..3673a28163 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -1043,8 +1043,10 @@ void LLFloaterPreference::refreshEnabledState() //Deferred/SSAO/Shadows LLCheckBoxCtrl* ctrl_deferred = getChild<LLCheckBoxCtrl>("UseLightShaders"); - if (LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") && - shaders) + + if (LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") && + shaders && + gGLManager.mHasFramebufferObject) { BOOL enabled = (ctrl_wind_light->get()) ? TRUE : FALSE; @@ -1127,7 +1129,8 @@ void LLFloaterPreference::disableUnavailableSettings() } // disabled deferred - if(!LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred")) + if (!LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") || + !gGLManager.mHasFramebufferObject) { ctrl_shadows->setEnabled(FALSE); ctrl_shadows->setValue(0); |