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/llpathfindingobject.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/llpathfindingobject.h') diff --git a/indra/newview/llpathfindingobject.h b/indra/newview/llpathfindingobject.h index b8d3ca2364..12dd18f986 100644 --- a/indra/newview/llpathfindingobject.h +++ b/indra/newview/llpathfindingobject.h @@ -56,10 +56,10 @@ public: inline const LLUUID& getUUID() const {return mUUID;}; inline const std::string& getName() const {return mName;}; inline const std::string& getDescription() const {return mDescription;}; - inline BOOL hasOwner() const {return mOwnerUUID.notNull();}; + inline bool hasOwner() const {return mOwnerUUID.notNull();}; inline bool hasOwnerName() const {return mHasOwnerName;}; std::string getOwnerName() const; - inline BOOL isGroupOwned() const {return mIsGroupOwned;}; + inline bool isGroupOwned() const {return mIsGroupOwned;}; inline const LLVector3& getLocation() const {return mLocation;}; typedef boost::function name_callback_t; @@ -84,7 +84,7 @@ private: bool mHasOwnerName; LLAvatarName mOwnerName; LLAvatarNameCache::callback_connection_t mAvatarNameCacheConnection; - BOOL mIsGroupOwned; + bool mIsGroupOwned; LLVector3 mLocation; name_signal_t mOwnerNameSignal; }; -- 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/llpathfindingobject.h | 184 ++++++++++++++++++------------------ 1 file changed, 92 insertions(+), 92 deletions(-) (limited to 'indra/newview/llpathfindingobject.h') diff --git a/indra/newview/llpathfindingobject.h b/indra/newview/llpathfindingobject.h index 4adf780268..17f12efd83 100644 --- a/indra/newview/llpathfindingobject.h +++ b/indra/newview/llpathfindingobject.h @@ -1,92 +1,92 @@ -/** -* @file llpathfindingobject.h -* @brief Header file for llpathfindingobject -* @author Stinson@lindenlab.com -* -* $LicenseInfo:firstyear=2012&license=viewerlgpl$ -* Second Life Viewer Source Code -* Copyright (C) 2012, 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_LLPATHFINDINGOBJECT_H -#define LL_LLPATHFINDINGOBJECT_H - -#include - -#include -#include -#include - -#include "llavatarname.h" -#include "llavatarnamecache.h" -#include "lluuid.h" -#include "v3math.h" - -class LLPathfindingObject; -class LLSD; - -typedef std::shared_ptr LLPathfindingObjectPtr; - -class LLPathfindingObject -{ -public: - LLPathfindingObject(); - LLPathfindingObject(const std::string &pUUID, const LLSD &pObjectData); - LLPathfindingObject(const LLPathfindingObject& pOther); - virtual ~LLPathfindingObject(); - - LLPathfindingObject& operator =(const LLPathfindingObject& pOther); - - inline const LLUUID& getUUID() const {return mUUID;}; - inline const std::string& getName() const {return mName;}; - inline const std::string& getDescription() const {return mDescription;}; - inline bool hasOwner() const {return mOwnerUUID.notNull();}; - inline bool hasOwnerName() const {return mHasOwnerName;}; - std::string getOwnerName() const; - inline bool isGroupOwned() const {return mIsGroupOwned;}; - inline const LLVector3& getLocation() const {return mLocation;}; - - typedef boost::function name_callback_t; - typedef boost::signals2::signal name_signal_t; - typedef boost::signals2::connection name_connection_t; - - name_connection_t registerOwnerNameListener(name_callback_t pOwnerNameCallback); - -protected: - -private: - void parseObjectData(const LLSD &pObjectData); - - void fetchOwnerName(); - void handleAvatarNameFetch(const LLUUID &pOwnerUUID, const LLAvatarName &pAvatarName); - void disconnectAvatarNameCacheConnection(); - - LLUUID mUUID; - std::string mName; - std::string mDescription; - LLUUID mOwnerUUID; - bool mHasOwnerName; - LLAvatarName mOwnerName; - LLAvatarNameCache::callback_connection_t mAvatarNameCacheConnection; - bool mIsGroupOwned; - LLVector3 mLocation; - name_signal_t mOwnerNameSignal; -}; - -#endif // LL_LLPATHFINDINGOBJECT_H +/** +* @file llpathfindingobject.h +* @brief Header file for llpathfindingobject +* @author Stinson@lindenlab.com +* +* $LicenseInfo:firstyear=2012&license=viewerlgpl$ +* Second Life Viewer Source Code +* Copyright (C) 2012, 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_LLPATHFINDINGOBJECT_H +#define LL_LLPATHFINDINGOBJECT_H + +#include + +#include +#include +#include + +#include "llavatarname.h" +#include "llavatarnamecache.h" +#include "lluuid.h" +#include "v3math.h" + +class LLPathfindingObject; +class LLSD; + +typedef std::shared_ptr LLPathfindingObjectPtr; + +class LLPathfindingObject +{ +public: + LLPathfindingObject(); + LLPathfindingObject(const std::string &pUUID, const LLSD &pObjectData); + LLPathfindingObject(const LLPathfindingObject& pOther); + virtual ~LLPathfindingObject(); + + LLPathfindingObject& operator =(const LLPathfindingObject& pOther); + + inline const LLUUID& getUUID() const {return mUUID;}; + inline const std::string& getName() const {return mName;}; + inline const std::string& getDescription() const {return mDescription;}; + inline bool hasOwner() const {return mOwnerUUID.notNull();}; + inline bool hasOwnerName() const {return mHasOwnerName;}; + std::string getOwnerName() const; + inline bool isGroupOwned() const {return mIsGroupOwned;}; + inline const LLVector3& getLocation() const {return mLocation;}; + + typedef boost::function name_callback_t; + typedef boost::signals2::signal name_signal_t; + typedef boost::signals2::connection name_connection_t; + + name_connection_t registerOwnerNameListener(name_callback_t pOwnerNameCallback); + +protected: + +private: + void parseObjectData(const LLSD &pObjectData); + + void fetchOwnerName(); + void handleAvatarNameFetch(const LLUUID &pOwnerUUID, const LLAvatarName &pAvatarName); + void disconnectAvatarNameCacheConnection(); + + LLUUID mUUID; + std::string mName; + std::string mDescription; + LLUUID mOwnerUUID; + bool mHasOwnerName; + LLAvatarName mOwnerName; + LLAvatarNameCache::callback_connection_t mAvatarNameCacheConnection; + bool mIsGroupOwned; + LLVector3 mLocation; + name_signal_t mOwnerNameSignal; +}; + +#endif // LL_LLPATHFINDINGOBJECT_H -- cgit v1.2.3