From 9c445f6edca76effd5f86deec6521f7549bbda71 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Thu, 14 May 2020 10:54:57 +0300 Subject: Revert SL-8191 due to it no longer being valid This reverts commit 4c006e76e39a8b59dc6f9c890e5a27d38b5ece50. Since EEP there are no 'basic shaders' and doing this in llfloatersettingsdebug was wrong either way --- indra/newview/llfloatersettingsdebug.cpp | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'indra/newview/llfloatersettingsdebug.cpp') diff --git a/indra/newview/llfloatersettingsdebug.cpp b/indra/newview/llfloatersettingsdebug.cpp index 8bac13a5f5..fb202b4c40 100644 --- a/indra/newview/llfloatersettingsdebug.cpp +++ b/indra/newview/llfloatersettingsdebug.cpp @@ -34,7 +34,6 @@ #include "llcolorswatch.h" #include "llviewercontrol.h" #include "lltexteditor.h" -#include "llviewershadermgr.h" LLFloaterSettingsDebug::LLFloaterSettingsDebug(const LLSD& key) @@ -208,11 +207,6 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp) getChildView("val_text")->setVisible( FALSE); mComment->setText(LLStringUtil::null); - getChild("boolean_combo")->setEnabled(true); - getChild("TRUE")->setEnabled(true); - getChild("FALSE")->setEnabled(true); - getChild("default_btn")->setEnabled(true); - if (controlp) { eControlType type = controlp->type(); @@ -294,19 +288,6 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp) { getChild("boolean_combo")->setValue(LLSD("")); } - - bool bUseVAO = controlp->getName() == "RenderUseVAO"; - if (bUseVAO) - { - bool use_shaders = LLViewerShaderMgr::instance()->getShaderLevel(LLViewerShaderMgr::SHADER_OBJECT) > 0; - getChild("boolean_combo")->setEnabled(use_shaders); - getChild("TRUE")->setEnabled(use_shaders); - getChild("FALSE")->setEnabled(use_shaders); - getChild("default_btn")->setEnabled(use_shaders); - if (!use_shaders) { - getChild("boolean_combo")->setValue(LLSD(false)); - } - } } break; case TYPE_STRING: -- cgit v1.2.3