summaryrefslogtreecommitdiff
path: root/indra/llrender
diff options
context:
space:
mode:
authorAnsariel <ansariel.hiller@phoenixviewer.com>2024-05-10 15:16:06 +0200
committerAnsariel <ansariel.hiller@phoenixviewer.com>2024-05-10 15:16:06 +0200
commit799ebf21624edb8b42ca16b8cf51c138643efd32 (patch)
tree438df7d344821c75c65625353198542103b18f9f /indra/llrender
parent155ddf23363f1d5c534c69f50505faf67e51948f (diff)
Fix broken merge and BOOL/bool issues
Diffstat (limited to 'indra/llrender')
-rw-r--r--indra/llrender/llshadermgr.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index 4e03882b7a..f649aa1963 100644
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -188,7 +188,7 @@ bool LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader)
if (!shader->attachFragmentObject("deferred/globalF.glsl"))
{
- return FALSE;
+ return false;
}
if (features->hasSrgb || features->hasAtmospherics || features->calculatesAtmospherics || features->isDeferred)
@@ -280,7 +280,7 @@ bool LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader)
{
if (!shader->attachFragmentObject("deferred/pbrterrainUtilF.glsl"))
{
- return FALSE;
+ return false;
}
}