diff options
| -rwxr-xr-x | indra/newview/llfloaterpreference.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/llpanelface.cpp | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index bbf88060c1..ecbb15969c 100755 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -1154,6 +1154,15 @@ 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"); diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 2d2a0d6d0c..6b50a97e8d 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -1878,6 +1878,7 @@ void LLPanelFace::updateMaterial() material_to_set = new LLMaterial(*mMaterial); } } + LLSelectMgr::getInstance()->selectionSetMaterial( material_to_set ); } else |