From dc813181a51ad2c22264e93a3c235cbf796b24ed Mon Sep 17 00:00:00 2001 From: Brad Linden Date: Thu, 27 Apr 2023 12:25:50 -0700 Subject: More post-merge fixes after DRTVWR-559 & DRTVWR-539 merge --- indra/newview/llfloaterpreferencesgraphicsadvanced.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'indra/newview/llfloaterpreferencesgraphicsadvanced.cpp') diff --git a/indra/newview/llfloaterpreferencesgraphicsadvanced.cpp b/indra/newview/llfloaterpreferencesgraphicsadvanced.cpp index d251c72672..a91f0ec060 100644 --- a/indra/newview/llfloaterpreferencesgraphicsadvanced.cpp +++ b/indra/newview/llfloaterpreferencesgraphicsadvanced.cpp @@ -439,21 +439,11 @@ void LLFloaterPreferenceGraphicsAdvanced::refreshEnabledState() shadow_text->setEnabled(enabled); // Hardware settings -# if 0 // TODO merge brad VRAM is rewritten - F32 mem_multiplier = gSavedSettings.getF32("RenderTextureMemoryMultiple"); - S32Megabytes min_tex_mem = LLViewerTextureList::getMinVideoRamSetting(); - S32Megabytes max_tex_mem = LLViewerTextureList::getMaxVideoRamSetting(false, mem_multiplier); - getChild("GraphicsCardTextureMemory")->setMinValue(min_tex_mem.value()); - getChild("GraphicsCardTextureMemory")->setMaxValue(max_tex_mem.value()); -#endif -#if 0 // cannot turn off VBOs anymore - if (!LLFeatureManager::getInstance()->isFeatureAvailable("RenderVBOEnable") || - !gGLManager.mHasVertexBufferObject) + if (!LLFeatureManager::getInstance()->isFeatureAvailable("RenderVBOEnable")) { getChildView("vbo")->setEnabled(FALSE); } -#endif if (!LLFeatureManager::getInstance()->isFeatureAvailable("RenderCompressTextures")) { -- cgit v1.2.3