diff options
Diffstat (limited to 'indra/newview/llpathfindinglinkset.h')
| -rw-r--r-- | indra/newview/llpathfindinglinkset.h | 35 |
1 files changed, 8 insertions, 27 deletions
diff --git a/indra/newview/llpathfindinglinkset.h b/indra/newview/llpathfindinglinkset.h index a729743739..cda71dffb3 100644 --- a/indra/newview/llpathfindinglinkset.h +++ b/indra/newview/llpathfindinglinkset.h @@ -28,21 +28,14 @@ #ifndef LL_LLPATHFINDINGLINKSET_H #define LL_LLPATHFINDINGLINKSET_H -#include "v3math.h" -#include "llavatarname.h" -#include "lluuid.h" - -#include <boost/shared_ptr.hpp> - -class LLSD; -class LLPathfindingLinkset; - -typedef boost::shared_ptr<LLPathfindingLinkset> LLPathfindingLinksetPtr; +#include "llpathfindingobject.h" #define DEPRECATED_NAVMESH_PERMANENT_WALKABLE_FLAGS #define MISSING_MODIFIABLE_FIELD_WAR -class LLPathfindingLinkset +class LLSD; + +class LLPathfindingLinkset : public LLPathfindingObject { public: typedef enum @@ -56,21 +49,15 @@ public: kDynamicPhantom } ELinksetUse; - LLPathfindingLinkset(const LLSD &pTerrainLinksetItem); - LLPathfindingLinkset(const std::string &pUUID, const LLSD &pLinksetItem); + LLPathfindingLinkset(const LLSD &pTerrainData); + LLPathfindingLinkset(const std::string &pUUID, const LLSD &pLinksetData); LLPathfindingLinkset(const LLPathfindingLinkset& pOther); virtual ~LLPathfindingLinkset(); LLPathfindingLinkset& operator = (const LLPathfindingLinkset& pOther); inline bool isTerrain() const {return mIsTerrain;}; - 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 hasOwnerName() const {return mOwnerUUID.notNull();}; - std::string getOwnerName() const; inline U32 getLandImpact() const {return mLandImpact;}; - inline const LLVector3& getLocation() const {return mLocation;}; BOOL isModifiable() const {return mIsModifiable;}; BOOL isPhantom() const; BOOL canBeVolume() const {return mCanBeVolume;}; @@ -100,8 +87,8 @@ private: kNavMeshGenerationExclude } ENavMeshGenerationCategory; - void parseObjectData(const LLSD &pLinksetItem); - void parsePathfindingData(const LLSD &pLinksetItem); + void parseLinksetData(const LLSD &pLinksetData); + void parsePathfindingData(const LLSD &pLinksetData); #ifdef DEPRECATED_NAVMESH_PERMANENT_WALKABLE_FLAGS static ELinksetUse getLinksetUse(bool pIsPhantom, bool pIsPermanent, bool pIsWalkable); @@ -114,14 +101,8 @@ private: static LLSD convertCategoryToLLSD(ENavMeshGenerationCategory pNavMeshGenerationCategory); static ENavMeshGenerationCategory convertCategoryFromLLSD(const LLSD &llsd); - LLUUID mUUID; bool mIsTerrain; - std::string mName; - std::string mDescription; - LLUUID mOwnerUUID; - LLAvatarName mOwnerName; U32 mLandImpact; - LLVector3 mLocation; #ifdef MISSING_MODIFIABLE_FIELD_WAR bool mHasModifiable; #endif // MISSING_MODIFIABLE_FIELD_WAR |