diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-05-24 18:38:03 +0000 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-05-24 18:38:03 +0000 |
| commit | 7fb07008fc1ab2b7a6d8da3d7079cf0fafda9928 (patch) | |
| tree | 311d04d5aca4a4ab6d0660a6bd5af2fb7bd5e45b /indra/newview/llfloaterpreference.cpp | |
| parent | 3365a39080744af0566adb7b6efd8e53fc6b3339 (diff) | |
| parent | 9f9465f5bd2160f0245805e32644ce37f8c6cca6 (diff) | |
Merged in SL-17219 (pull request #992)
SL-17219
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 8d19aa36bb..70114df989 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -1275,12 +1275,7 @@ void LLFloaterPreferenceGraphicsAdvanced::refreshEnabledState() shadow_text->setEnabled(enabled); // Hardware settings - 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()); - + if (!LLFeatureManager::getInstance()->isFeatureAvailable("RenderVBOEnable") || !gGLManager.mHasVertexBufferObject) { |