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/llfloaterbuy.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'indra/newview/llfloaterbuy.h') diff --git a/indra/newview/llfloaterbuy.h b/indra/newview/llfloaterbuy.h index e83b3c6ba6..fedbdce965 100644 --- a/indra/newview/llfloaterbuy.h +++ b/indra/newview/llfloaterbuy.h @@ -49,19 +49,18 @@ public: LLFloaterBuy(const LLSD& key); ~LLFloaterBuy(); - /*virtual*/ BOOL postBuild(); - /*virtual*/ void onClose(bool app_quitting); + bool postBuild() override; + void onClose(bool app_quitting) override; static void show(const LLSaleInfo& sale_info); protected: void reset(); - void requestObjectInventories(); - /*virtual*/ void inventoryChanged(LLViewerObject* obj, - LLInventoryObject::object_list_t* inv, - S32 serial_num, - void* data); + void inventoryChanged(LLViewerObject* obj, + LLInventoryObject::object_list_t* inv, + S32 serial_num, + void* data) override; void onSelectionChanged(); void showViews(bool show); -- 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/llfloaterbuy.h | 156 +++++++++++++++++++++---------------------- 1 file changed, 78 insertions(+), 78 deletions(-) (limited to 'indra/newview/llfloaterbuy.h') diff --git a/indra/newview/llfloaterbuy.h b/indra/newview/llfloaterbuy.h index 940a34f398..8c8a3efc64 100644 --- a/indra/newview/llfloaterbuy.h +++ b/indra/newview/llfloaterbuy.h @@ -1,78 +1,78 @@ -/** - * @file llfloaterbuy.h - * @author James Cook - * @brief LLFloaterBuy class definition - * - * $LicenseInfo:firstyear=2004&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$ - */ - -/** - * Floater that appears when buying an object, giving a preview - * of its contents and their permissions. - */ - -#ifndef LL_LLFLOATERBUY_H -#define LL_LLFLOATERBUY_H - -#include "llfloater.h" -#include "llvoinventorylistener.h" -#include "llsaleinfo.h" -#include "llinventory.h" - -class LLViewerObject; -class LLSaleInfo; -class LLObjectSelection; - -class LLFloaterBuy -: public LLFloater, public LLVOInventoryListener -{ -public: - LLFloaterBuy(const LLSD& key); - ~LLFloaterBuy(); - - bool postBuild() override; - void onClose(bool app_quitting) override; - - static void show(const LLSaleInfo& sale_info); - -protected: - void reset(); - - void inventoryChanged(LLViewerObject* obj, - LLInventoryObject::object_list_t* inv, - S32 serial_num, - void* data) override; - - void onSelectionChanged(); - void showViews(bool show); - - void onClickBuy(); - void onClickCancel(); - -private: - LLSafeHandle mObjectSelection; - LLSaleInfo mSaleInfo; - - boost::signals2::connection mSelectionUpdateSlot; -}; - -#endif +/** + * @file llfloaterbuy.h + * @author James Cook + * @brief LLFloaterBuy class definition + * + * $LicenseInfo:firstyear=2004&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$ + */ + +/** + * Floater that appears when buying an object, giving a preview + * of its contents and their permissions. + */ + +#ifndef LL_LLFLOATERBUY_H +#define LL_LLFLOATERBUY_H + +#include "llfloater.h" +#include "llvoinventorylistener.h" +#include "llsaleinfo.h" +#include "llinventory.h" + +class LLViewerObject; +class LLSaleInfo; +class LLObjectSelection; + +class LLFloaterBuy +: public LLFloater, public LLVOInventoryListener +{ +public: + LLFloaterBuy(const LLSD& key); + ~LLFloaterBuy(); + + bool postBuild() override; + void onClose(bool app_quitting) override; + + static void show(const LLSaleInfo& sale_info); + +protected: + void reset(); + + void inventoryChanged(LLViewerObject* obj, + LLInventoryObject::object_list_t* inv, + S32 serial_num, + void* data) override; + + void onSelectionChanged(); + void showViews(bool show); + + void onClickBuy(); + void onClickCancel(); + +private: + LLSafeHandle mObjectSelection; + LLSaleInfo mSaleInfo; + + boost::signals2::connection mSelectionUpdateSlot; +}; + +#endif -- cgit v1.2.3