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/llcofwearables.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llcofwearables.h') diff --git a/indra/newview/llcofwearables.h b/indra/newview/llcofwearables.h index 9957d6a64e..53d39671f6 100644 --- a/indra/newview/llcofwearables.h +++ b/indra/newview/llcofwearables.h @@ -68,7 +68,7 @@ public: LLCOFWearables(); virtual ~LLCOFWearables(); - /*virtual*/ BOOL postBuild(); + /*virtual*/ bool postBuild(); LLUUID getSelectedUUID(); bool getSelectedUUIDs(uuid_vec_t& selected_ids); -- 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/llcofwearables.h | 276 ++++++++++++++++++++--------------------- 1 file changed, 138 insertions(+), 138 deletions(-) (limited to 'indra/newview/llcofwearables.h') diff --git a/indra/newview/llcofwearables.h b/indra/newview/llcofwearables.h index 5bec4d9e6b..6f0e97a98b 100644 --- a/indra/newview/llcofwearables.h +++ b/indra/newview/llcofwearables.h @@ -1,138 +1,138 @@ -/** - * @file llcofwearables.h - * @brief LLCOFWearables displayes wearables from the current outfit split into three lists (attachments, clothing and body parts) - * - * $LicenseInfo:firstyear=2010&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_LLCOFWEARABLES_H -#define LL_LLCOFWEARABLES_H - -// llui -#include "llflatlistview.h" -#include "llpanel.h" - -#include "llappearancemgr.h" -#include "llinventorymodel.h" - -class LLAccordionCtrl; -class LLAccordionCtrlTab; -class LLListContextMenu; -class LLPanelClothingListItem; -class LLPanelBodyPartsListItem; -class LLPanelDeletableWearableListItem; - -class LLCOFWearables : public LLPanel -{ -public: - - /** - * Represents a collection of callbacks assigned to inventory panel item's buttons - */ - class LLCOFCallbacks - { - public: - LLCOFCallbacks() {}; - virtual ~LLCOFCallbacks() {}; - - typedef boost::function cof_callback_t; - - cof_callback_t mAddWearable; - cof_callback_t mMoveWearableCloser; - cof_callback_t mMoveWearableFurther; - cof_callback_t mEditWearable; - cof_callback_t mDeleteWearable; - }; - - - - LLCOFWearables(); - virtual ~LLCOFWearables(); - - /*virtual*/ bool postBuild(); - - LLUUID getSelectedUUID(); - bool getSelectedUUIDs(uuid_vec_t& selected_ids); - - LLPanel* getSelectedItem(); - void getSelectedItems(std::vector& selected_items) const; - - /* Repopulate the COF wearables list if the COF category has been changed since the last refresh */ - void refresh(); - void clear(); - - LLAssetType::EType getExpandedAccordionAssetType(); - LLAssetType::EType getSelectedAccordionAssetType(); - void expandDefaultAccordionTab(); - - LLCOFCallbacks& getCOFCallbacks() { return mCOFCallbacks; } - - /** - * Selects first clothing item with specified LLWearableType::EType from clothing list - */ - void selectClothing(LLWearableType::EType clothing_type); - - void setAttachmentsTitle(); - -protected: - - void populateAttachmentsAndBodypartsLists(const LLInventoryModel::item_array_t& cof_items); - void populateClothingList(LLAppearanceMgr::wearables_by_type_t& clothing_by_type); - - void addClothingTypesDummies(const LLAppearanceMgr::wearables_by_type_t& clothing_by_type); - void onSelectionChange(LLFlatListView* selected_list); - void onAccordionTabStateChanged(LLUICtrl* ctrl, const LLSD& expanded); - - LLPanelClothingListItem* buildClothingListItem(LLViewerInventoryItem* item, bool first, bool last); - LLPanelBodyPartsListItem* buildBodypartListItem(LLViewerInventoryItem* item); - LLPanelDeletableWearableListItem* buildAttachemntListItem(LLViewerInventoryItem* item); - - void onListRightClick(LLUICtrl* ctrl, S32 x, S32 y, LLListContextMenu* menu); - - LLFlatListView* mAttachments; - LLFlatListView* mClothing; - LLFlatListView* mBodyParts; - - LLFlatListView* mLastSelectedList; - - LLAccordionCtrlTab* mClothingTab; - LLAccordionCtrlTab* mAttachmentsTab; - LLAccordionCtrlTab* mBodyPartsTab; - - LLAccordionCtrlTab* mLastSelectedTab; - - std::map mTab2AssetType; - - LLCOFCallbacks mCOFCallbacks; - - LLListContextMenu* mClothingMenu; - LLListContextMenu* mAttachmentMenu; - LLListContextMenu* mBodyPartMenu; - - LLAccordionCtrl* mAccordionCtrl; - - /* COF category version since last refresh */ - S32 mCOFVersion; -}; - - -#endif +/** + * @file llcofwearables.h + * @brief LLCOFWearables displayes wearables from the current outfit split into three lists (attachments, clothing and body parts) + * + * $LicenseInfo:firstyear=2010&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_LLCOFWEARABLES_H +#define LL_LLCOFWEARABLES_H + +// llui +#include "llflatlistview.h" +#include "llpanel.h" + +#include "llappearancemgr.h" +#include "llinventorymodel.h" + +class LLAccordionCtrl; +class LLAccordionCtrlTab; +class LLListContextMenu; +class LLPanelClothingListItem; +class LLPanelBodyPartsListItem; +class LLPanelDeletableWearableListItem; + +class LLCOFWearables : public LLPanel +{ +public: + + /** + * Represents a collection of callbacks assigned to inventory panel item's buttons + */ + class LLCOFCallbacks + { + public: + LLCOFCallbacks() {}; + virtual ~LLCOFCallbacks() {}; + + typedef boost::function cof_callback_t; + + cof_callback_t mAddWearable; + cof_callback_t mMoveWearableCloser; + cof_callback_t mMoveWearableFurther; + cof_callback_t mEditWearable; + cof_callback_t mDeleteWearable; + }; + + + + LLCOFWearables(); + virtual ~LLCOFWearables(); + + /*virtual*/ bool postBuild(); + + LLUUID getSelectedUUID(); + bool getSelectedUUIDs(uuid_vec_t& selected_ids); + + LLPanel* getSelectedItem(); + void getSelectedItems(std::vector& selected_items) const; + + /* Repopulate the COF wearables list if the COF category has been changed since the last refresh */ + void refresh(); + void clear(); + + LLAssetType::EType getExpandedAccordionAssetType(); + LLAssetType::EType getSelectedAccordionAssetType(); + void expandDefaultAccordionTab(); + + LLCOFCallbacks& getCOFCallbacks() { return mCOFCallbacks; } + + /** + * Selects first clothing item with specified LLWearableType::EType from clothing list + */ + void selectClothing(LLWearableType::EType clothing_type); + + void setAttachmentsTitle(); + +protected: + + void populateAttachmentsAndBodypartsLists(const LLInventoryModel::item_array_t& cof_items); + void populateClothingList(LLAppearanceMgr::wearables_by_type_t& clothing_by_type); + + void addClothingTypesDummies(const LLAppearanceMgr::wearables_by_type_t& clothing_by_type); + void onSelectionChange(LLFlatListView* selected_list); + void onAccordionTabStateChanged(LLUICtrl* ctrl, const LLSD& expanded); + + LLPanelClothingListItem* buildClothingListItem(LLViewerInventoryItem* item, bool first, bool last); + LLPanelBodyPartsListItem* buildBodypartListItem(LLViewerInventoryItem* item); + LLPanelDeletableWearableListItem* buildAttachemntListItem(LLViewerInventoryItem* item); + + void onListRightClick(LLUICtrl* ctrl, S32 x, S32 y, LLListContextMenu* menu); + + LLFlatListView* mAttachments; + LLFlatListView* mClothing; + LLFlatListView* mBodyParts; + + LLFlatListView* mLastSelectedList; + + LLAccordionCtrlTab* mClothingTab; + LLAccordionCtrlTab* mAttachmentsTab; + LLAccordionCtrlTab* mBodyPartsTab; + + LLAccordionCtrlTab* mLastSelectedTab; + + std::map mTab2AssetType; + + LLCOFCallbacks mCOFCallbacks; + + LLListContextMenu* mClothingMenu; + LLListContextMenu* mAttachmentMenu; + LLListContextMenu* mBodyPartMenu; + + LLAccordionCtrl* mAccordionCtrl; + + /* COF category version since last refresh */ + S32 mCOFVersion; +}; + + +#endif -- cgit v1.2.3