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/llpanelplaceinfo.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llpanelplaceinfo.h') diff --git a/indra/newview/llpanelplaceinfo.h b/indra/newview/llpanelplaceinfo.h index 533215016a..c9dfca6b62 100644 --- a/indra/newview/llpanelplaceinfo.h +++ b/indra/newview/llpanelplaceinfo.h @@ -62,7 +62,7 @@ public: LLPanelPlaceInfo(); /*virtual*/ ~LLPanelPlaceInfo(); - /*virtual*/ BOOL postBuild(); + /*virtual*/ bool postBuild(); // Ignore all old location information, useful if you are // recycling an existing dialog and need to clear it. @@ -89,7 +89,7 @@ public: /*virtual*/ void processParcelInfo(const LLParcelData& parcel_data); - /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); + /*virtual*/ void reshape(S32 width, S32 height, bool called_from_parent = true); // Create a pick for the location specified // by global_pos. -- 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/llpanelplaceinfo.h | 258 +++++++++++++++++++-------------------- 1 file changed, 129 insertions(+), 129 deletions(-) (limited to 'indra/newview/llpanelplaceinfo.h') diff --git a/indra/newview/llpanelplaceinfo.h b/indra/newview/llpanelplaceinfo.h index b8eb863be4..6e90603ce5 100644 --- a/indra/newview/llpanelplaceinfo.h +++ b/indra/newview/llpanelplaceinfo.h @@ -1,129 +1,129 @@ -/** - * @file llpanelplaceinfo.h - * @brief Base class for place information in Side Tray. - * - * $LicenseInfo:firstyear=2009&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_LLPANELPLACEINFO_H -#define LL_LLPANELPLACEINFO_H - -#include "llpanel.h" - -#include "v3dmath.h" -#include "lluuid.h" - -#include "llremoteparcelrequest.h" - -class LLAvatarName; -class LLExpandableTextBox; -class LLIconCtrl; -class LLInventoryItem; -class LLParcel; -class LLScrollContainer; -class LLTextBox; -class LLTextureCtrl; -class LLViewerRegion; -class LLViewerInventoryCategory; - -class LLPanelPlaceInfo : public LLPanel, LLRemoteParcelInfoObserver -{ -public: - enum EInfoType - { - UNKNOWN, - - AGENT, - CREATE_LANDMARK, - LANDMARK, - PLACE, - TELEPORT_HISTORY - }; - - LLPanelPlaceInfo(); - /*virtual*/ ~LLPanelPlaceInfo(); - - /*virtual*/ bool postBuild(); - - // Ignore all old location information, useful if you are - // recycling an existing dialog and need to clear it. - virtual void resetLocation(); - - // Sends a request for data about the given parcel, which will - // only update the location if there is none already available. - /*virtual*/ void setParcelID(const LLUUID& parcel_id); - - // Depending on how the panel was triggered - // (from landmark or current location, or other) - // sets a corresponding title and contents. - virtual void setInfoType(EInfoType type); - - // Requests remote parcel info by parcel ID. - void sendParcelInfoRequest(); - - // Displays information about a remote parcel. - // Sends a request to the server. - void displayParcelInfo(const LLUUID& region_id, - const LLVector3d& pos_global); - - /*virtual*/ void setErrorStatus(S32 status, const std::string& reason); - - /*virtual*/ void processParcelInfo(const LLParcelData& parcel_data); - - /*virtual*/ void reshape(S32 width, S32 height, bool called_from_parent = true); - - // Create a pick for the location specified - // by global_pos. - void createPick(const LLVector3d& pos_global); - -protected: - static void onNameCache(LLTextBox* text, const std::string& full_name); - static void onAvatarNameCache(const LLUUID& agent_id, - const LLAvatarName& av_name, - LLTextBox* text); - - /** - * mParcelID is valid only for remote places, in other cases it's null. See resetLocation() - */ - LLUUID mParcelID; - LLUUID mRequestedID; - LLVector3 mPosRegion; - std::string mParcelTitle; // used for pick title without coordinates - std::string mRegionTitle; - std::string mCurrentTitle; - S32 mScrollingPanelMinHeight; - S32 mScrollingPanelWidth; - EInfoType mInfoType; - - LLScrollContainer* mScrollContainer; - LLPanel* mScrollingPanel; - LLTextBox* mTitle; - LLTextureCtrl* mSnapshotCtrl; - LLTextBox* mRegionName; - LLTextBox* mParcelName; - LLTextBox* mParcelOwner; - LLExpandableTextBox* mDescEditor; - LLIconCtrl* mMaturityRatingIcon; - LLTextBox* mMaturityRatingText; -}; - -#endif // LL_LLPANELPLACEINFO_H +/** + * @file llpanelplaceinfo.h + * @brief Base class for place information in Side Tray. + * + * $LicenseInfo:firstyear=2009&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_LLPANELPLACEINFO_H +#define LL_LLPANELPLACEINFO_H + +#include "llpanel.h" + +#include "v3dmath.h" +#include "lluuid.h" + +#include "llremoteparcelrequest.h" + +class LLAvatarName; +class LLExpandableTextBox; +class LLIconCtrl; +class LLInventoryItem; +class LLParcel; +class LLScrollContainer; +class LLTextBox; +class LLTextureCtrl; +class LLViewerRegion; +class LLViewerInventoryCategory; + +class LLPanelPlaceInfo : public LLPanel, LLRemoteParcelInfoObserver +{ +public: + enum EInfoType + { + UNKNOWN, + + AGENT, + CREATE_LANDMARK, + LANDMARK, + PLACE, + TELEPORT_HISTORY + }; + + LLPanelPlaceInfo(); + /*virtual*/ ~LLPanelPlaceInfo(); + + /*virtual*/ bool postBuild(); + + // Ignore all old location information, useful if you are + // recycling an existing dialog and need to clear it. + virtual void resetLocation(); + + // Sends a request for data about the given parcel, which will + // only update the location if there is none already available. + /*virtual*/ void setParcelID(const LLUUID& parcel_id); + + // Depending on how the panel was triggered + // (from landmark or current location, or other) + // sets a corresponding title and contents. + virtual void setInfoType(EInfoType type); + + // Requests remote parcel info by parcel ID. + void sendParcelInfoRequest(); + + // Displays information about a remote parcel. + // Sends a request to the server. + void displayParcelInfo(const LLUUID& region_id, + const LLVector3d& pos_global); + + /*virtual*/ void setErrorStatus(S32 status, const std::string& reason); + + /*virtual*/ void processParcelInfo(const LLParcelData& parcel_data); + + /*virtual*/ void reshape(S32 width, S32 height, bool called_from_parent = true); + + // Create a pick for the location specified + // by global_pos. + void createPick(const LLVector3d& pos_global); + +protected: + static void onNameCache(LLTextBox* text, const std::string& full_name); + static void onAvatarNameCache(const LLUUID& agent_id, + const LLAvatarName& av_name, + LLTextBox* text); + + /** + * mParcelID is valid only for remote places, in other cases it's null. See resetLocation() + */ + LLUUID mParcelID; + LLUUID mRequestedID; + LLVector3 mPosRegion; + std::string mParcelTitle; // used for pick title without coordinates + std::string mRegionTitle; + std::string mCurrentTitle; + S32 mScrollingPanelMinHeight; + S32 mScrollingPanelWidth; + EInfoType mInfoType; + + LLScrollContainer* mScrollContainer; + LLPanel* mScrollingPanel; + LLTextBox* mTitle; + LLTextureCtrl* mSnapshotCtrl; + LLTextBox* mRegionName; + LLTextBox* mParcelName; + LLTextBox* mParcelOwner; + LLExpandableTextBox* mDescEditor; + LLIconCtrl* mMaturityRatingIcon; + LLTextBox* mMaturityRatingText; +}; + +#endif // LL_LLPANELPLACEINFO_H -- cgit v1.2.3