From c285f59ce2a05703e3a1232fcaf3ee3aea714b3f Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sun, 18 Feb 2024 12:52:19 +0100
Subject: Replace BOOL with bool in llwindow and dependent classes

---
 indra/newview/lltoolface.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/lltoolface.h')

diff --git a/indra/newview/lltoolface.h b/indra/newview/lltoolface.h
index e4b8ae12b8..d063c9966e 100644
--- a/indra/newview/lltoolface.h
+++ b/indra/newview/lltoolface.h
@@ -39,8 +39,8 @@ class LLToolFace
 	virtual ~LLToolFace();
 public:
 
-	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleDoubleClick(S32 x, S32 y, MASK mask);
+	virtual bool	handleMouseDown(S32 x, S32 y, MASK mask);
+	virtual bool	handleDoubleClick(S32 x, S32 y, MASK mask);
 	virtual void	handleSelect();
 	virtual void	handleDeselect();
 	virtual void	render();			// draw face highlights
-- 
cgit v1.2.3


From e2e37cced861b98de8c1a7c9c0d3a50d2d90e433 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 22 May 2024 21:25:21 +0200
Subject: Fix line endlings

---
 indra/newview/lltoolface.h | 102 ++++++++++++++++++++++-----------------------
 1 file changed, 51 insertions(+), 51 deletions(-)

(limited to 'indra/newview/lltoolface.h')

diff --git a/indra/newview/lltoolface.h b/indra/newview/lltoolface.h
index af4824ab78..18d42da1e1 100644
--- a/indra/newview/lltoolface.h
+++ b/indra/newview/lltoolface.h
@@ -1,51 +1,51 @@
-/**
- * @file lltoolface.h
- * @brief A tool to select object faces
- *
- * $LicenseInfo:firstyear=2001&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLTOOLFACE_H
-#define LL_LLTOOLFACE_H
-
-#include "lltool.h"
-
-class LLViewerObject;
-class LLPickInfo;
-
-class LLToolFace
-:   public LLTool, public LLSingleton<LLToolFace>
-{
-    LLSINGLETON(LLToolFace);
-    virtual ~LLToolFace();
-public:
-
-    virtual bool    handleMouseDown(S32 x, S32 y, MASK mask) override;
-    virtual bool    handleDoubleClick(S32 x, S32 y, MASK mask) override;
-    virtual void    handleSelect() override;
-    virtual void    handleDeselect() override;
-    virtual void    render() override;          // draw face highlights
-
-    static void pickCallback(const LLPickInfo& pick_info);
-};
-
-#endif
+/**
+ * @file lltoolface.h
+ * @brief A tool to select object faces
+ *
+ * $LicenseInfo:firstyear=2001&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLTOOLFACE_H
+#define LL_LLTOOLFACE_H
+
+#include "lltool.h"
+
+class LLViewerObject;
+class LLPickInfo;
+
+class LLToolFace
+:   public LLTool, public LLSingleton<LLToolFace>
+{
+    LLSINGLETON(LLToolFace);
+    virtual ~LLToolFace();
+public:
+
+    virtual bool    handleMouseDown(S32 x, S32 y, MASK mask) override;
+    virtual bool    handleDoubleClick(S32 x, S32 y, MASK mask) override;
+    virtual void    handleSelect() override;
+    virtual void    handleDeselect() override;
+    virtual void    render() override;          // draw face highlights
+
+    static void pickCallback(const LLPickInfo& pick_info);
+};
+
+#endif
-- 
cgit v1.2.3