diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-04-25 21:00:16 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-04-25 21:00:16 -0700 |
| commit | fd447189c5e05df53cd8ec0a4168370c03c3bb16 (patch) | |
| tree | 484b5075ff9c977dd29679c87f6eaa08144b292f /indra/newview/llfloaterpreference.cpp | |
| parent | b1d608ee99824fde13f3f16e0947ec5b54299fca (diff) | |
| parent | 2dc4f8f8e98da565c158ec9947fe96eccd4920e9 (diff) | |
Merge 3.5.1 into Materials
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
| -rwxr-xr-x | indra/newview/llfloaterpreference.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index ecbb15969c..bbf88060c1 100755 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -1154,15 +1154,6 @@ void LLFloaterPreference::refreshEnabledState() gSavedSettings.getBOOL("RenderAvatarVP") && (ctrl_wind_light->get()) ? TRUE : FALSE; - if (!enabled) - { - llinfos << "LLFloaterPreference: NOT ENABLING DEFFERED....feature available? " - << (LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") ? "yup" : "nope") - << " shaders? " << (shaders ? "yup" : "nope") << " FBO? " << (gGLManager.mHasFramebufferObject ? "yup" : "nope") - << " renderAvVP? " << (gSavedSettings.getBOOL("RenderAvatarVP") ? "yup" : "nope") - << " windlight? " << ((ctrl_wind_light->get()) ? "yup" : "nope") << llendl; - } - ctrl_deferred->setEnabled(enabled); LLCheckBoxCtrl* ctrl_ssao = getChild<LLCheckBoxCtrl>("UseSSAO"); |