From 1b69994ffac5248d7f671f8db15e82847914f68e Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Sun, 29 Jul 2012 22:25:41 -0400 Subject: [PATCH] Respect graphics requirements for FBOs and Hardware Skinning in graphics preferences, properly. --- indra/newview/llpaneldisplay.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/indra/newview/llpaneldisplay.cpp b/indra/newview/llpaneldisplay.cpp index a758c0a99..d5a888d12 100644 --- a/indra/newview/llpaneldisplay.cpp +++ b/indra/newview/llpaneldisplay.cpp @@ -576,20 +576,22 @@ void LLPanelDisplay::refreshEnabledState() mSkyFactorText->setEnabled(wlatmos); // Avatar Mode and FBO - childSetEnabled("fbo", gGLManager.mHasFramebufferObject && !LLPipeline::sRenderDeferred); if (render_deferred && wlatmos && shaders) { + childSetEnabled("fbo", false); childSetValue("fbo", true); mCtrlAvatarVP->setEnabled(false); - mCtrlAvatarVP->setValue(true); + gSavedSettings.setBOOL("RenderAvatarVP", true); } else if (!shaders) { + childSetEnabled("fbo", gGLManager.mHasFramebufferObject); mCtrlAvatarVP->setEnabled(false); - mCtrlAvatarVP->setValue(false); + gSavedSettings.setBOOL("RenderAvatarVP", false); } else { + childSetEnabled("fbo", gGLManager.mHasFramebufferObject); mCtrlAvatarVP->setEnabled(true); }