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/llviewercamera.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/llviewercamera.cpp b/indra/newview/llviewercamera.cpp
index f54b6f799e..cd7012dc6a 100644
--- a/indra/newview/llviewercamera.cpp
+++ b/indra/newview/llviewercamera.cpp
@@ -767,7 +767,7 @@ bool LLViewerCamera::cameraUnderWater() const
     if (gPipeline.mHeroProbeManager.isMirrorPass())
     {
         // TODO: figure out how to handle this case
-        return FALSE;
+        return false;
     }
 
     if (!regionp)
-- 
cgit v1.2.3