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/llpathfindingobjectlist.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/llpathfindingobjectlist.h')
| -rw-r--r-- | indra/newview/llpathfindingobjectlist.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/indra/newview/llpathfindingobjectlist.h b/indra/newview/llpathfindingobjectlist.h index e2e0dce4da..654423183e 100644 --- a/indra/newview/llpathfindingobjectlist.h +++ b/indra/newview/llpathfindingobjectlist.h @@ -1,4 +1,4 @@ -/** +/** * @file llpathfindingobjectlist.h * @brief Header file for llpathfindingobjectlist * @author Stinson@lindenlab.com @@ -42,27 +42,27 @@ typedef std::map<std::string, LLPathfindingObjectPtr> LLPathfindingObjectMap; class LLPathfindingObjectList { public: - LLPathfindingObjectList(); - virtual ~LLPathfindingObjectList(); + LLPathfindingObjectList(); + virtual ~LLPathfindingObjectList(); - bool isEmpty() const; + bool isEmpty() const; - void clear(); + void clear(); - void update(LLPathfindingObjectPtr pUpdateObjectPtr); - void update(LLPathfindingObjectListPtr pUpdateObjectListPtr); + void update(LLPathfindingObjectPtr pUpdateObjectPtr); + void update(LLPathfindingObjectListPtr pUpdateObjectListPtr); - LLPathfindingObjectPtr find(const std::string &pObjectId) const; + LLPathfindingObjectPtr find(const std::string &pObjectId) const; - typedef LLPathfindingObjectMap::const_iterator const_iterator; - const_iterator begin() const; - const_iterator end() const; + typedef LLPathfindingObjectMap::const_iterator const_iterator; + const_iterator begin() const; + const_iterator end() const; protected: - LLPathfindingObjectMap &getObjectMap(); + LLPathfindingObjectMap &getObjectMap(); private: - LLPathfindingObjectMap mObjectMap; + LLPathfindingObjectMap mObjectMap; }; #endif // LL_LLPATHFINDINGOBJECTLIST_H |