diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-06-10 17:06:06 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-06-10 19:25:02 +0300 |
| commit | 0dcc912cecdfb365c1f4246545ece40ccb7bc18e (patch) | |
| tree | ccf664c765d1adbbf4985069321df65c85ca36e2 /indra/newview/llpathfindingnavmeshstatus.h | |
| parent | bd8438f7083643ae5812b14e35e69e69ef1616c6 (diff) | |
| parent | d317454c82e016a02c8a708a0118f3ff29aa8e82 (diff) | |
Merge main into inventory_favorites
# Conflicts:
# indra/llui/llfolderviewmodel.h
# indra/newview/llpanelwearing.cpp
# indra/newview/llwearableitemslist.cpp
Diffstat (limited to 'indra/newview/llpathfindingnavmeshstatus.h')
| -rw-r--r-- | indra/newview/llpathfindingnavmeshstatus.h | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/indra/newview/llpathfindingnavmeshstatus.h b/indra/newview/llpathfindingnavmeshstatus.h index 74533fa484..e429d13a3f 100644 --- a/indra/newview/llpathfindingnavmeshstatus.h +++ b/indra/newview/llpathfindingnavmeshstatus.h @@ -1,4 +1,4 @@ -/** +/** * @file llpathfindingnavmeshstatus.h * @brief Header file for llpathfindingnavmeshstatus * @author Stinson@lindenlab.com @@ -36,42 +36,42 @@ class LLSD; class LLPathfindingNavMeshStatus { public: - typedef enum - { - kPending, - kBuilding, - kComplete, - kRepending - } ENavMeshStatus; + typedef enum + { + kPending, + kBuilding, + kComplete, + kRepending + } ENavMeshStatus; - LLPathfindingNavMeshStatus(); - LLPathfindingNavMeshStatus(const LLUUID &pRegionUUID); - LLPathfindingNavMeshStatus(const LLUUID &pRegionUUID, const LLSD &pContent); - LLPathfindingNavMeshStatus(const LLSD &pContent); - LLPathfindingNavMeshStatus(const LLPathfindingNavMeshStatus &pOther); - virtual ~LLPathfindingNavMeshStatus(); + LLPathfindingNavMeshStatus(); + LLPathfindingNavMeshStatus(const LLUUID &pRegionUUID); + LLPathfindingNavMeshStatus(const LLUUID &pRegionUUID, const LLSD &pContent); + LLPathfindingNavMeshStatus(const LLSD &pContent); + LLPathfindingNavMeshStatus(const LLPathfindingNavMeshStatus &pOther); + virtual ~LLPathfindingNavMeshStatus(); - LLPathfindingNavMeshStatus &operator =(const LLPathfindingNavMeshStatus &pOther); + LLPathfindingNavMeshStatus &operator =(const LLPathfindingNavMeshStatus &pOther); - bool isValid() const {return mIsValid;}; - const LLUUID &getRegionUUID() const {return mRegionUUID;}; - U32 getVersion() const {return mVersion;}; - ENavMeshStatus getStatus() const {return mStatus;}; + bool isValid() const {return mIsValid;}; + const LLUUID &getRegionUUID() const {return mRegionUUID;}; + U32 getVersion() const {return mVersion;}; + ENavMeshStatus getStatus() const {return mStatus;}; protected: private: - void parseStatus(const LLSD &pContent); + void parseStatus(const LLSD &pContent); - bool mIsValid; - LLUUID mRegionUUID; - U32 mVersion; - ENavMeshStatus mStatus; + bool mIsValid; + LLUUID mRegionUUID; + U32 mVersion; + ENavMeshStatus mStatus; - static const std::string sStatusPending; - static const std::string sStatusBuilding; - static const std::string sStatusComplete; - static const std::string sStatusRepending; + static const std::string sStatusPending; + static const std::string sStatusBuilding; + static const std::string sStatusComplete; + static const std::string sStatusRepending; }; #endif // LL_LLPATHFINDINGNAVMESHSTATUS_H |