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/llfloateravatar.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/llfloateravatar.cpp b/indra/newview/llfloateravatar.cpp
index f888d032ae..d76e6a2aa1 100644
--- a/indra/newview/llfloateravatar.cpp
+++ b/indra/newview/llfloateravatar.cpp
@@ -52,7 +52,7 @@ LLFloaterAvatar::~LLFloaterAvatar()
 	}
 }
 
-BOOL LLFloaterAvatar::postBuild()
+bool LLFloaterAvatar::postBuild()
 {
     mAvatarPicker = findChild<LLMediaCtrl>("avatar_picker_contents");
     if (mAvatarPicker)
@@ -60,7 +60,7 @@ BOOL LLFloaterAvatar::postBuild()
         mAvatarPicker->clearCache();
     }
 	enableResizeCtrls(true, true, false);
-	return TRUE;
+	return true;
 }
 
 
-- 
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/llfloateravatar.cpp | 132 +++++++++++++++++++-------------------
 1 file changed, 66 insertions(+), 66 deletions(-)

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

diff --git a/indra/newview/llfloateravatar.cpp b/indra/newview/llfloateravatar.cpp
index 226d615ca4..6a38d7549c 100644
--- a/indra/newview/llfloateravatar.cpp
+++ b/indra/newview/llfloateravatar.cpp
@@ -1,66 +1,66 @@
-/**
- * @file llfloateravatar.h
- * @author Leyla Farazha
- * @brief floater for the avatar changer
- *
- * $LicenseInfo:firstyear=2011&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2011, 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$
- */
-
-/**
- * Floater that appears when buying an object, giving a preview
- * of its contents and their permissions.
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llfloateravatar.h"
-#include "lluictrlfactory.h"
-#include "llmediactrl.h"
-
-
-LLFloaterAvatar::LLFloaterAvatar(const LLSD& key)
-    :   LLFloater(key)
-{
-}
-
-LLFloaterAvatar::~LLFloaterAvatar()
-{
-    if (mAvatarPicker)
-    {
-        mAvatarPicker->navigateStop();
-        mAvatarPicker->clearCache();          //images are reloading each time already
-        mAvatarPicker->unloadMediaSource();
-    }
-}
-
-bool LLFloaterAvatar::postBuild()
-{
-    mAvatarPicker = findChild<LLMediaCtrl>("avatar_picker_contents");
-    if (mAvatarPicker)
-    {
-        mAvatarPicker->clearCache();
-    }
-    enableResizeCtrls(true, true, false);
-    return true;
-}
-
-
+/**
+ * @file llfloateravatar.h
+ * @author Leyla Farazha
+ * @brief floater for the avatar changer
+ *
+ * $LicenseInfo:firstyear=2011&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2011, 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$
+ */
+
+/**
+ * Floater that appears when buying an object, giving a preview
+ * of its contents and their permissions.
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llfloateravatar.h"
+#include "lluictrlfactory.h"
+#include "llmediactrl.h"
+
+
+LLFloaterAvatar::LLFloaterAvatar(const LLSD& key)
+    :   LLFloater(key)
+{
+}
+
+LLFloaterAvatar::~LLFloaterAvatar()
+{
+    if (mAvatarPicker)
+    {
+        mAvatarPicker->navigateStop();
+        mAvatarPicker->clearCache();          //images are reloading each time already
+        mAvatarPicker->unloadMediaSource();
+    }
+}
+
+bool LLFloaterAvatar::postBuild()
+{
+    mAvatarPicker = findChild<LLMediaCtrl>("avatar_picker_contents");
+    if (mAvatarPicker)
+    {
+        mAvatarPicker->clearCache();
+    }
+    enableResizeCtrls(true, true, false);
+    return true;
+}
+
+
-- 
cgit v1.2.3