From 799ebf21624edb8b42ca16b8cf51c138643efd32 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Fri, 10 May 2024 15:16:06 +0200
Subject: Fix broken merge and BOOL/bool issues

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

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

diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp
index 744c55d64a..407256bea2 100644
--- a/indra/newview/lldynamictexture.cpp
+++ b/indra/newview/lldynamictexture.cpp
@@ -196,7 +196,7 @@ bool LLViewerDynamicTexture::updateAllInstances()
 	if (!bake_target.isComplete())
     {
         llassert(false);
-		return FALSE;
+		return false;
     }
     llassert(bake_target.getWidth() >= LLPipeline::MAX_BAKE_WIDTH);
     llassert(bake_target.getHeight() >= LLPipeline::MAX_BAKE_WIDTH);
-- 
cgit v1.2.3