diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-04-27 12:25:50 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-04-27 13:51:42 -0700 |
| commit | dc813181a51ad2c22264e93a3c235cbf796b24ed (patch) | |
| tree | 1fa3c1c99c40e373b118dfe5fa0d90855b7c7d84 /indra/newview/llfloaterpreferencesgraphicsadvanced.cpp | |
| parent | 513ac361b13b081a13f1f6dde1c0c34c4eb41b3a (diff) | |
More post-merge fixes after DRTVWR-559 & DRTVWR-539 merge
Diffstat (limited to 'indra/newview/llfloaterpreferencesgraphicsadvanced.cpp')
| -rw-r--r-- | indra/newview/llfloaterpreferencesgraphicsadvanced.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
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<LLSliderCtrl>("GraphicsCardTextureMemory")->setMinValue(min_tex_mem.value()); - getChild<LLSliderCtrl>("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")) { |