From a5261a5fa8fad810ecb5c260d92c3e771822bf58 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Tue, 20 Feb 2024 23:46:23 +0100
Subject: Convert BOOL to bool in llui

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

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

diff --git a/indra/newview/llfloaterhoverheight.h b/indra/newview/llfloaterhoverheight.h
index a643fa2516..08d3f26acb 100644
--- a/indra/newview/llfloaterhoverheight.h
+++ b/indra/newview/llfloaterhoverheight.h
@@ -33,7 +33,7 @@ class LLFloaterHoverHeight: public LLFloater
 {
 public:
 	LLFloaterHoverHeight(const LLSD& key);
-	BOOL postBuild();
+	bool postBuild();
 
 	static void onSliderMoved(LLUICtrl* ctrl, void* userData);
 
-- 
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/llfloaterhoverheight.h | 104 +++++++++++++++++------------------
 1 file changed, 52 insertions(+), 52 deletions(-)

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

diff --git a/indra/newview/llfloaterhoverheight.h b/indra/newview/llfloaterhoverheight.h
index 285007d4bf..029370b26b 100644
--- a/indra/newview/llfloaterhoverheight.h
+++ b/indra/newview/llfloaterhoverheight.h
@@ -1,52 +1,52 @@
-/**
-* @file   llfloaterhoverheight.h
-* @brief  Controller for self avatar hover height.
-* @author vir@lindenlab.com
-*
-* $LicenseInfo:firstyear=2014&license=viewerlgpl$
-* Second Life Viewer Source Code
-* Copyright (C) 2014, 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_LLFLOATERHOVERHEIGHT_H
-#define LL_LLFLOATERHOVERHEIGHT_H
-
-#include "llfloater.h"
-
-class LLFloaterHoverHeight: public LLFloater
-{
-public:
-    LLFloaterHoverHeight(const LLSD& key);
-    bool postBuild();
-
-    static void onSliderMoved(LLUICtrl* ctrl, void* userData);
-
-    void onFinalCommit();
-
-    static void syncFromPreferenceSetting(void *user_data, bool update_offset = true);
-
-    void onRegionChanged();
-    void onSimulatorFeaturesReceived(const LLUUID &region_id);
-    void updateEditEnabled();
-
-    /*virtual*/ void onClose(bool app_quitting);
-    boost::signals2::connection mRegionChangedSlot;
-};
-
-#endif
+/**
+* @file   llfloaterhoverheight.h
+* @brief  Controller for self avatar hover height.
+* @author vir@lindenlab.com
+*
+* $LicenseInfo:firstyear=2014&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2014, 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_LLFLOATERHOVERHEIGHT_H
+#define LL_LLFLOATERHOVERHEIGHT_H
+
+#include "llfloater.h"
+
+class LLFloaterHoverHeight: public LLFloater
+{
+public:
+    LLFloaterHoverHeight(const LLSD& key);
+    bool postBuild();
+
+    static void onSliderMoved(LLUICtrl* ctrl, void* userData);
+
+    void onFinalCommit();
+
+    static void syncFromPreferenceSetting(void *user_data, bool update_offset = true);
+
+    void onRegionChanged();
+    void onSimulatorFeaturesReceived(const LLUUID &region_id);
+    void updateEditEnabled();
+
+    /*virtual*/ void onClose(bool app_quitting);
+    boost::signals2::connection mRegionChangedSlot;
+};
+
+#endif
-- 
cgit v1.2.3