From a5261a5fa8fad810ecb5c260d92c3e771822bf58 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 20 Feb 2024 23:46:23 +0100 Subject: Convert BOOL to bool in llui --- indra/newview/llpanelland.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpanelland.h') diff --git a/indra/newview/llpanelland.h b/indra/newview/llpanelland.h index 2ab1618d47..aa2a14d440 100644 --- a/indra/newview/llpanelland.h +++ b/indra/newview/llpanelland.h @@ -56,7 +56,7 @@ protected: static void onClickAbout(); protected: - virtual BOOL postBuild(); + bool postBuild() override; static LLPanelLandSelectObserver* sObserver; static LLPanelLandInfo* sInstance; -- cgit v1.2.3 From 0fb52bd372aad468c890fc57f4ae3b8be7dad463 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Wed, 21 Feb 2024 03:31:20 +0200 Subject: viewer#848 Xcode buildfix --- indra/newview/llpanelland.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpanelland.h') diff --git a/indra/newview/llpanelland.h b/indra/newview/llpanelland.h index aa2a14d440..9626414f31 100644 --- a/indra/newview/llpanelland.h +++ b/indra/newview/llpanelland.h @@ -43,7 +43,7 @@ public: LLPanelLandInfo(); virtual ~LLPanelLandInfo(); - void refresh(); + void refresh() override; static void refreshAll(); LLCheckBoxCtrl *mCheckShowOwners; -- cgit v1.2.3 From e2e37cced861b98de8c1a7c9c0d3a50d2d90e433 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 22 May 2024 21:25:21 +0200 Subject: Fix line endlings --- indra/newview/llpanelland.h | 130 ++++++++++++++++++++++---------------------- 1 file changed, 65 insertions(+), 65 deletions(-) (limited to 'indra/newview/llpanelland.h') diff --git a/indra/newview/llpanelland.h b/indra/newview/llpanelland.h index cd0f0b9441..7d0c6936bd 100644 --- a/indra/newview/llpanelland.h +++ b/indra/newview/llpanelland.h @@ -1,65 +1,65 @@ -/** - * @file llpanelland.h - * @brief Land information in the tool floater, NOT the "About Land" floater - * - * $LicenseInfo:firstyear=2002&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_LLPANELLAND_H -#define LL_LLPANELLAND_H - -#include "llpanel.h" - -class LLTextBox; -class LLCheckBoxCtrl; -class LLButton; -class LLSpinCtrl; -class LLLineEditor; -class LLPanelLandSelectObserver; - -class LLPanelLandInfo -: public LLPanel -{ -public: - LLPanelLandInfo(); - virtual ~LLPanelLandInfo(); - - void refresh() override; - static void refreshAll(); - - LLCheckBoxCtrl *mCheckShowOwners; - -protected: - static void onClickClaim(); - static void onClickRelease(); - static void onClickDivide(); - static void onClickJoin(); - static void onClickAbout(); - -protected: - bool postBuild() override; - - static LLPanelLandSelectObserver* sObserver; - static LLPanelLandInfo* sInstance; -}; - -#endif +/** + * @file llpanelland.h + * @brief Land information in the tool floater, NOT the "About Land" floater + * + * $LicenseInfo:firstyear=2002&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_LLPANELLAND_H +#define LL_LLPANELLAND_H + +#include "llpanel.h" + +class LLTextBox; +class LLCheckBoxCtrl; +class LLButton; +class LLSpinCtrl; +class LLLineEditor; +class LLPanelLandSelectObserver; + +class LLPanelLandInfo +: public LLPanel +{ +public: + LLPanelLandInfo(); + virtual ~LLPanelLandInfo(); + + void refresh() override; + static void refreshAll(); + + LLCheckBoxCtrl *mCheckShowOwners; + +protected: + static void onClickClaim(); + static void onClickRelease(); + static void onClickDivide(); + static void onClickJoin(); + static void onClickAbout(); + +protected: + bool postBuild() override; + + static LLPanelLandSelectObserver* sObserver; + static LLPanelLandInfo* sInstance; +}; + +#endif -- cgit v1.2.3