diff options
Diffstat (limited to 'indra/newview/llpathfindingobject.h')
| -rw-r--r-- | indra/newview/llpathfindingobject.h | 67 |
1 files changed, 33 insertions, 34 deletions
diff --git a/indra/newview/llpathfindingobject.h b/indra/newview/llpathfindingobject.h index b8d3ca2364..79a796dd60 100644 --- a/indra/newview/llpathfindingobject.h +++ b/indra/newview/llpathfindingobject.h @@ -1,4 +1,4 @@ -/** +/** * @file llpathfindingobject.h * @brief Header file for llpathfindingobject * @author Stinson@lindenlab.com @@ -29,7 +29,6 @@ #include <string> -#include <boost/shared_ptr.hpp> #include <boost/function.hpp> #include <boost/signals2.hpp> @@ -41,52 +40,52 @@ class LLPathfindingObject; class LLSD; -typedef boost::shared_ptr<LLPathfindingObject> LLPathfindingObjectPtr; +typedef std::shared_ptr<LLPathfindingObject> LLPathfindingObjectPtr; class LLPathfindingObject { public: - LLPathfindingObject(); - LLPathfindingObject(const std::string &pUUID, const LLSD &pObjectData); - LLPathfindingObject(const LLPathfindingObject& pOther); - virtual ~LLPathfindingObject(); + LLPathfindingObject(); + LLPathfindingObject(const std::string &pUUID, const LLSD &pObjectData); + LLPathfindingObject(const LLPathfindingObject& pOther); + virtual ~LLPathfindingObject(); - LLPathfindingObject& operator =(const LLPathfindingObject& pOther); + 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;}; + 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<void (const LLPathfindingObject *)> name_callback_t; - typedef boost::signals2::signal<void (const LLPathfindingObject *)> name_signal_t; - typedef boost::signals2::connection name_connection_t; + typedef boost::function<void (const LLPathfindingObject *)> name_callback_t; + typedef boost::signals2::signal<void (const LLPathfindingObject *)> name_signal_t; + typedef boost::signals2::connection name_connection_t; - name_connection_t registerOwnerNameListener(name_callback_t pOwnerNameCallback); + name_connection_t registerOwnerNameListener(name_callback_t pOwnerNameCallback); protected: private: - void parseObjectData(const LLSD &pObjectData); + void parseObjectData(const LLSD &pObjectData); - void fetchOwnerName(); - void handleAvatarNameFetch(const LLUUID &pOwnerUUID, const LLAvatarName &pAvatarName); - void disconnectAvatarNameCacheConnection(); + 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; + 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 |