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/llfloaterfixedenvironment.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/llfloaterfixedenvironment.h') diff --git a/indra/newview/llfloaterfixedenvironment.h b/indra/newview/llfloaterfixedenvironment.h index f35f4a4368..a5d3e50f7c 100644 --- a/indra/newview/llfloaterfixedenvironment.h +++ b/indra/newview/llfloaterfixedenvironment.h @@ -50,7 +50,7 @@ public: LLFloaterFixedEnvironment(const LLSD &key); ~LLFloaterFixedEnvironment(); - virtual BOOL postBuild() override; + virtual bool postBuild() override; virtual void onOpen(const LLSD& key) override; virtual void onClose(bool app_quitting) override; @@ -101,7 +101,7 @@ class LLFloaterFixedEnvironmentWater : public LLFloaterFixedEnvironment public: LLFloaterFixedEnvironmentWater(const LLSD &key); - BOOL postBuild() override; + bool postBuild() override; virtual void onOpen(const LLSD& key) override; @@ -121,7 +121,7 @@ class LLFloaterFixedEnvironmentSky : public LLFloaterFixedEnvironment public: LLFloaterFixedEnvironmentSky(const LLSD &key); - BOOL postBuild() override; + bool postBuild() override; virtual void onOpen(const LLSD& key) override; virtual void onClose(bool app_quitting) override; -- 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/llfloaterfixedenvironment.h | 276 +++++++++++++++--------------- 1 file changed, 138 insertions(+), 138 deletions(-) (limited to 'indra/newview/llfloaterfixedenvironment.h') diff --git a/indra/newview/llfloaterfixedenvironment.h b/indra/newview/llfloaterfixedenvironment.h index 401740a4c8..ac6acdd568 100644 --- a/indra/newview/llfloaterfixedenvironment.h +++ b/indra/newview/llfloaterfixedenvironment.h @@ -1,138 +1,138 @@ -/** - * @file llfloaterfixedenvironment.h - * @brief Floaters to create and edit fixed settings for sky and water. - * - * $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$ - */ - -#ifndef LL_FLOATERFIXEDENVIRONMENT_H -#define LL_FLOATERFIXEDENVIRONMENT_H - -#include "llfloatereditenvironmentbase.h" -#include "llsettingsbase.h" -#include "llflyoutcombobtn.h" -#include "llinventory.h" - -#include "boost/signals2.hpp" - -class LLTabContainer; -class LLButton; -class LLLineEditor; -class LLFloaterSettingsPicker; -class LLFixedSettingCopiedCallback; - -/** - * Floater container for creating and editing fixed environment settings. - */ -class LLFloaterFixedEnvironment : public LLFloaterEditEnvironmentBase -{ - LOG_CLASS(LLFloaterFixedEnvironment); -public: - LLFloaterFixedEnvironment(const LLSD &key); - ~LLFloaterFixedEnvironment(); - - virtual bool postBuild() override; - virtual void onOpen(const LLSD& key) override; - virtual void onClose(bool app_quitting) override; - - void setEditSettings(const LLSettingsBase::ptr_t &settings) { mSettings = settings; clearDirtyFlag(); syncronizeTabs(); refresh(); } - virtual LLSettingsBase::ptr_t getEditSettings() const override { return mSettings; } - -protected: - typedef std::function on_confirm_fn; - - virtual void refresh() override; - void setEditSettingsAndUpdate(const LLSettingsBase::ptr_t &settings) override; - virtual void syncronizeTabs(); - - virtual LLFloaterSettingsPicker *getSettingsPicker() override; - - LLTabContainer * mTab; - LLLineEditor * mTxtName; - - LLSettingsBase::ptr_t mSettings; - - LLFlyoutComboBtnCtrl * mFlyoutControl; - - void onInventoryCreated(LLUUID asset_id, LLUUID inventory_id); - void onInventoryCreated(LLUUID asset_id, LLUUID inventory_id, LLSD results); - void onInventoryUpdated(LLUUID asset_id, LLUUID inventory_id, LLSD results); - - virtual void clearDirtyFlag() override; - void updatePermissionFlags(); - - void doSelectFromInventory(); - - virtual void onClickCloseBtn(bool app_quitting = false) override; - -private: - void onNameChanged(const std::string &name); - - void onButtonImport(); - void onButtonApply(LLUICtrl *ctrl, const LLSD &data); - void onButtonLoad(); - - void onPickerCommitSetting(LLUUID item_id); -}; - -class LLFloaterFixedEnvironmentWater : public LLFloaterFixedEnvironment -{ - LOG_CLASS(LLFloaterFixedEnvironmentWater); - -public: - LLFloaterFixedEnvironmentWater(const LLSD &key); - - bool postBuild() override; - - virtual void onOpen(const LLSD& key) override; - -protected: - virtual void updateEditEnvironment() override; - - virtual void doImportFromDisk() override; - void loadWaterSettingFromFile(const std::vector& filenames); - -private: -}; - -class LLFloaterFixedEnvironmentSky : public LLFloaterFixedEnvironment -{ - LOG_CLASS(LLFloaterFixedEnvironmentSky); - -public: - LLFloaterFixedEnvironmentSky(const LLSD &key); - - bool postBuild() override; - - virtual void onOpen(const LLSD& key) override; - virtual void onClose(bool app_quitting) override; - -protected: - virtual void updateEditEnvironment() override; - - virtual void doImportFromDisk() override; - void loadSkySettingFromFile(const std::vector& filenames); - -private: -}; - -#endif // LL_FLOATERFIXEDENVIRONMENT_H +/** + * @file llfloaterfixedenvironment.h + * @brief Floaters to create and edit fixed settings for sky and water. + * + * $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$ + */ + +#ifndef LL_FLOATERFIXEDENVIRONMENT_H +#define LL_FLOATERFIXEDENVIRONMENT_H + +#include "llfloatereditenvironmentbase.h" +#include "llsettingsbase.h" +#include "llflyoutcombobtn.h" +#include "llinventory.h" + +#include "boost/signals2.hpp" + +class LLTabContainer; +class LLButton; +class LLLineEditor; +class LLFloaterSettingsPicker; +class LLFixedSettingCopiedCallback; + +/** + * Floater container for creating and editing fixed environment settings. + */ +class LLFloaterFixedEnvironment : public LLFloaterEditEnvironmentBase +{ + LOG_CLASS(LLFloaterFixedEnvironment); +public: + LLFloaterFixedEnvironment(const LLSD &key); + ~LLFloaterFixedEnvironment(); + + virtual bool postBuild() override; + virtual void onOpen(const LLSD& key) override; + virtual void onClose(bool app_quitting) override; + + void setEditSettings(const LLSettingsBase::ptr_t &settings) { mSettings = settings; clearDirtyFlag(); syncronizeTabs(); refresh(); } + virtual LLSettingsBase::ptr_t getEditSettings() const override { return mSettings; } + +protected: + typedef std::function on_confirm_fn; + + virtual void refresh() override; + void setEditSettingsAndUpdate(const LLSettingsBase::ptr_t &settings) override; + virtual void syncronizeTabs(); + + virtual LLFloaterSettingsPicker *getSettingsPicker() override; + + LLTabContainer * mTab; + LLLineEditor * mTxtName; + + LLSettingsBase::ptr_t mSettings; + + LLFlyoutComboBtnCtrl * mFlyoutControl; + + void onInventoryCreated(LLUUID asset_id, LLUUID inventory_id); + void onInventoryCreated(LLUUID asset_id, LLUUID inventory_id, LLSD results); + void onInventoryUpdated(LLUUID asset_id, LLUUID inventory_id, LLSD results); + + virtual void clearDirtyFlag() override; + void updatePermissionFlags(); + + void doSelectFromInventory(); + + virtual void onClickCloseBtn(bool app_quitting = false) override; + +private: + void onNameChanged(const std::string &name); + + void onButtonImport(); + void onButtonApply(LLUICtrl *ctrl, const LLSD &data); + void onButtonLoad(); + + void onPickerCommitSetting(LLUUID item_id); +}; + +class LLFloaterFixedEnvironmentWater : public LLFloaterFixedEnvironment +{ + LOG_CLASS(LLFloaterFixedEnvironmentWater); + +public: + LLFloaterFixedEnvironmentWater(const LLSD &key); + + bool postBuild() override; + + virtual void onOpen(const LLSD& key) override; + +protected: + virtual void updateEditEnvironment() override; + + virtual void doImportFromDisk() override; + void loadWaterSettingFromFile(const std::vector& filenames); + +private: +}; + +class LLFloaterFixedEnvironmentSky : public LLFloaterFixedEnvironment +{ + LOG_CLASS(LLFloaterFixedEnvironmentSky); + +public: + LLFloaterFixedEnvironmentSky(const LLSD &key); + + bool postBuild() override; + + virtual void onOpen(const LLSD& key) override; + virtual void onClose(bool app_quitting) override; + +protected: + virtual void updateEditEnvironment() override; + + virtual void doImportFromDisk() override; + void loadSkySettingFromFile(const std::vector& filenames); + +private: +}; + +#endif // LL_FLOATERFIXEDENVIRONMENT_H -- cgit v1.2.3