From 9d26ce372b44412e2e82eb9d73d3608d1327fc06 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 20 Apr 2020 22:48:03 +0300
Subject: Fixed merge conflicts

---
 indra/newview/llfloatersettingsdebug.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llfloatersettingsdebug.cpp')

diff --git a/indra/newview/llfloatersettingsdebug.cpp b/indra/newview/llfloatersettingsdebug.cpp
index 73269d0531..8bac13a5f5 100644
--- a/indra/newview/llfloatersettingsdebug.cpp
+++ b/indra/newview/llfloatersettingsdebug.cpp
@@ -298,7 +298,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
 				bool bUseVAO = controlp->getName() == "RenderUseVAO";
 				if (bUseVAO)
 				{
-					bool use_shaders = LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_OBJECT) > 0;
+					bool use_shaders = LLViewerShaderMgr::instance()->getShaderLevel(LLViewerShaderMgr::SHADER_OBJECT) > 0;
 					getChild<LLUICtrl>("boolean_combo")->setEnabled(use_shaders);
 					getChild<LLUICtrl>("TRUE")->setEnabled(use_shaders);
 					getChild<LLUICtrl>("FALSE")->setEnabled(use_shaders);
-- 
cgit v1.2.3