diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-06-12 17:04:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-12 17:04:34 -0700 |
| commit | 100ebbab2437de7f5d124a0d7b8279a7a7b57656 (patch) | |
| tree | e8b4200dae16e89698c2f3eadae05634041681a1 /indra/newview/llpathfindinglinkset.h | |
| parent | f5e2708a0fc4e08d3d0a5dc393bbd4bac09e1c55 (diff) | |
| parent | ae74ca80692c8bcf157e903033fcfa1778706d64 (diff) | |
Merge pull request #1745 from secondlife/project/gltf_development
move project/gltf development to develop
Diffstat (limited to 'indra/newview/llpathfindinglinkset.h')
| -rw-r--r-- | indra/newview/llpathfindinglinkset.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/llpathfindinglinkset.h b/indra/newview/llpathfindinglinkset.h index ef236d5949..0f2268861f 100644 --- a/indra/newview/llpathfindinglinkset.h +++ b/indra/newview/llpathfindinglinkset.h @@ -56,15 +56,15 @@ public: inline bool isTerrain() const {return mIsTerrain;}; inline U32 getLandImpact() const {return mLandImpact;}; - BOOL isModifiable() const {return mIsModifiable;}; - BOOL isPhantom() const; - BOOL canBeVolume() const {return mCanBeVolume;}; + bool isModifiable() const {return mIsModifiable;}; + bool isPhantom() const; + bool canBeVolume() const {return mCanBeVolume;}; static ELinksetUse getLinksetUseWithToggledPhantom(ELinksetUse pLinksetUse); inline ELinksetUse getLinksetUse() const {return mLinksetUse;}; - inline BOOL isScripted() const {return mIsScripted;}; - inline BOOL hasIsScripted() const {return mHasIsScripted;}; + inline bool isScripted() const {return mIsScripted;}; + inline bool hasIsScripted() const {return mHasIsScripted;}; inline S32 getWalkabilityCoefficientA() const {return mWalkabilityCoefficientA;}; inline S32 getWalkabilityCoefficientB() const {return mWalkabilityCoefficientB;}; @@ -92,7 +92,7 @@ private: void parseLinksetData(const LLSD &pLinksetData); void parsePathfindingData(const LLSD &pLinksetData); - static BOOL isPhantom(ELinksetUse pLinksetUse); + static bool isPhantom(ELinksetUse pLinksetUse); static ELinksetUse getLinksetUse(bool pIsPhantom, ENavMeshGenerationCategory pNavMeshGenerationCategory); static ENavMeshGenerationCategory getNavMeshGenerationCategory(ELinksetUse pLinksetUse); static LLSD convertCategoryToLLSD(ENavMeshGenerationCategory pNavMeshGenerationCategory); @@ -100,10 +100,10 @@ private: bool mIsTerrain; U32 mLandImpact; - BOOL mIsModifiable; - BOOL mCanBeVolume; - BOOL mIsScripted; - BOOL mHasIsScripted; + bool mIsModifiable; + bool mCanBeVolume; + bool mIsScripted; + bool mHasIsScripted; ELinksetUse mLinksetUse; S32 mWalkabilityCoefficientA; S32 mWalkabilityCoefficientB; |