summaryrefslogtreecommitdiff
path: root/indra/newview/llfeaturemanager.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2022-09-12 11:48:30 -0500
committerDave Parks <davep@lindenlab.com>2022-09-12 11:48:30 -0500
commitc5af5d10edb26d255d0aa2e27eedbbd3f514024e (patch)
tree459dc84efeb2cc75b980b97311dc769b821b021c /indra/newview/llfeaturemanager.cpp
parentd7c77e5c64ddfef44b3e47f4c7ae6943ff0e860a (diff)
parent03df9545092cc3917e1c3f947ce2270d0ba31134 (diff)
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llfeaturemanager.cpp')
-rw-r--r--indra/newview/llfeaturemanager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index e934041e2e..826d4892ef 100644
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -607,7 +607,7 @@ void LLFeatureManager::applyFeatures(bool skipFeatures)
void LLFeatureManager::setGraphicsLevel(U32 level, bool skipFeatures)
{
LLViewerShaderMgr::sSkipReload = true;
-
+ flush_glerror(); // Whatever may have already happened (e.g., to cause us to change), don't let confuse it with new initializations.
applyBaseMasks();
// if we're passed an invalid level, default to "Low"