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/llfloateropenobject.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llfloateropenobject.h') diff --git a/indra/newview/llfloateropenobject.h b/indra/newview/llfloateropenobject.h index 745753316b..3b81601eb6 100644 --- a/indra/newview/llfloateropenobject.h +++ b/indra/newview/llfloateropenobject.h @@ -55,7 +55,7 @@ public: protected: - /*virtual*/ BOOL postBuild(); + /*virtual*/ bool postBuild(); void refresh(); void draw(); virtual void onOpen(const LLSD& key); -- cgit v1.2.3 From 60d3dd98a44230c21803c1606552ee098ed9fa7c Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 21 Feb 2024 21:05:14 +0100 Subject: Convert remaining BOOL to bool --- indra/newview/llfloateropenobject.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llfloateropenobject.h') diff --git a/indra/newview/llfloateropenobject.h b/indra/newview/llfloateropenobject.h index 3b81601eb6..953fae21d2 100644 --- a/indra/newview/llfloateropenobject.h +++ b/indra/newview/llfloateropenobject.h @@ -76,7 +76,7 @@ protected: LLPanelObjectInventory* mPanelInventoryObject; LLSafeHandle mObjectSelection; - BOOL mDirty; + bool mDirty; }; #endif -- 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/llfloateropenobject.h | 164 ++++++++++++++++++------------------ 1 file changed, 82 insertions(+), 82 deletions(-) (limited to 'indra/newview/llfloateropenobject.h') diff --git a/indra/newview/llfloateropenobject.h b/indra/newview/llfloateropenobject.h index 18b17b3ef0..3670dbc5e6 100644 --- a/indra/newview/llfloateropenobject.h +++ b/indra/newview/llfloateropenobject.h @@ -1,82 +1,82 @@ -/** - * @file llfloateropenobject.h - * @brief LLFloaterOpenObject 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$ - */ - -/* - * Shows the contents of an object and their permissions when you - * click "Buy..." on an object with "Sell Contents" checked. - */ - -#ifndef LL_LLFLOATEROPENOBJECT_H -#define LL_LLFLOATEROPENOBJECT_H - -#include "llfloater.h" - -class LLObjectSelection; -class LLPanelObjectInventory; - -class LLFloaterOpenObject -: public LLFloater -{ - friend class LLFloaterReg; -public: - - void dirty(); - - struct LLCatAndWear - { - LLUUID mCatID; - bool mWear; - bool mFolderResponded; - bool mReplace; - }; - -protected: - - /*virtual*/ bool postBuild(); - void refresh(); - void draw(); - virtual void onOpen(const LLSD& key); - - void moveToInventory(bool wear, bool replace = false); - - void onClickMoveToInventory(); - void onClickCancel(); - static void callbackCreateInventoryCategory(const LLUUID& category_id, LLUUID object_id, bool wear, bool replace = false); - static void callbackMoveInventory(S32 result, void* data); - -private: - - LLFloaterOpenObject(const LLSD& key); - ~LLFloaterOpenObject(); - -protected: - - LLPanelObjectInventory* mPanelInventoryObject; - LLSafeHandle mObjectSelection; - bool mDirty; -}; - -#endif +/** + * @file llfloateropenobject.h + * @brief LLFloaterOpenObject 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$ + */ + +/* + * Shows the contents of an object and their permissions when you + * click "Buy..." on an object with "Sell Contents" checked. + */ + +#ifndef LL_LLFLOATEROPENOBJECT_H +#define LL_LLFLOATEROPENOBJECT_H + +#include "llfloater.h" + +class LLObjectSelection; +class LLPanelObjectInventory; + +class LLFloaterOpenObject +: public LLFloater +{ + friend class LLFloaterReg; +public: + + void dirty(); + + struct LLCatAndWear + { + LLUUID mCatID; + bool mWear; + bool mFolderResponded; + bool mReplace; + }; + +protected: + + /*virtual*/ bool postBuild(); + void refresh(); + void draw(); + virtual void onOpen(const LLSD& key); + + void moveToInventory(bool wear, bool replace = false); + + void onClickMoveToInventory(); + void onClickCancel(); + static void callbackCreateInventoryCategory(const LLUUID& category_id, LLUUID object_id, bool wear, bool replace = false); + static void callbackMoveInventory(S32 result, void* data); + +private: + + LLFloaterOpenObject(const LLSD& key); + ~LLFloaterOpenObject(); + +protected: + + LLPanelObjectInventory* mPanelInventoryObject; + LLSafeHandle mObjectSelection; + bool mDirty; +}; + +#endif -- cgit v1.2.3