diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 11:16:27 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 11:16:27 +0300 |
| commit | bccc10db9a90d365c353baebf443fde2030ce970 (patch) | |
| tree | 2c2e1fd94b29667a809f8d7285d049f5ff5d424d /indra/newview/llpathfindingcharacter.h | |
| parent | 531cd34f670170ade57f8813fe48012b61a1d3c2 (diff) | |
| parent | bb3c36f5cbc0c3b542045fd27255eee24e03da22 (diff) | |
Merge branch 'main' into marchcat/x-b-merge
# Conflicts:
# autobuild.xml
# indra/cmake/ConfigurePkgConfig.cmake
# indra/cmake/ICU4C.cmake
# indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
# indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h
# indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
# indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
# indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
# indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llfloateremojipicker.cpp
# indra/newview/lloutfitslist.cpp
Diffstat (limited to 'indra/newview/llpathfindingcharacter.h')
| -rw-r--r-- | indra/newview/llpathfindingcharacter.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/indra/newview/llpathfindingcharacter.h b/indra/newview/llpathfindingcharacter.h index 7cf9f401b0..ac5a113f96 100644 --- a/indra/newview/llpathfindingcharacter.h +++ b/indra/newview/llpathfindingcharacter.h @@ -1,4 +1,4 @@ -/** +/** * @file llpathfindingcharacter.h * @brief Definition of a pathfinding character that contains various properties required for havok pathfinding. * @author Stinson@lindenlab.com @@ -36,28 +36,28 @@ class LLSD; class LLPathfindingCharacter : public LLPathfindingObject { public: - LLPathfindingCharacter(const std::string &pUUID, const LLSD &pCharacterData); - LLPathfindingCharacter(const LLPathfindingCharacter& pOther); - virtual ~LLPathfindingCharacter(); + LLPathfindingCharacter(const std::string &pUUID, const LLSD &pCharacterData); + LLPathfindingCharacter(const LLPathfindingCharacter& pOther); + virtual ~LLPathfindingCharacter(); - LLPathfindingCharacter& operator =(const LLPathfindingCharacter& pOther); + LLPathfindingCharacter& operator =(const LLPathfindingCharacter& pOther); - inline F32 getCPUTime() const {return mCPUTime;}; + inline F32 getCPUTime() const {return mCPUTime;}; - inline BOOL isHorizontal() const {return mIsHorizontal;}; - inline F32 getLength() const {return mLength;}; - inline F32 getRadius() const {return mRadius;}; + inline BOOL isHorizontal() const {return mIsHorizontal;}; + inline F32 getLength() const {return mLength;}; + inline F32 getRadius() const {return mRadius;}; protected: private: - void parseCharacterData(const LLSD &pCharacterData); + void parseCharacterData(const LLSD &pCharacterData); - F32 mCPUTime; + F32 mCPUTime; - BOOL mIsHorizontal; - F32 mLength; - F32 mRadius; + BOOL mIsHorizontal; + F32 mLength; + F32 mRadius; }; #endif // LL_LLPATHFINDINGCHARACTER_H |