diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-12-03 22:30:28 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-12-03 22:30:28 +0200 |
| commit | 3021e1959ec32192e03e8e210db4b174250c87e2 (patch) | |
| tree | 19eb7557666b6871cef246bb23085665465021f8 /indra/newview/llpathfindingpathtool.h | |
| parent | 29518cdf4a9e3c9ee214d358bcc1e8f1c3fd6c93 (diff) | |
| parent | 189ffd46e0316e333bc850f69eb7ed57dd7829e7 (diff) | |
Merge branch 'develop-linux' into marchcat/slua-linux
# Conflicts:
# indra/newview/llfeaturemanager.cpp
Diffstat (limited to 'indra/newview/llpathfindingpathtool.h')
| -rw-r--r-- | indra/newview/llpathfindingpathtool.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpathfindingpathtool.h b/indra/newview/llpathfindingpathtool.h index 189b9d4954..f6b4500f0f 100644 --- a/indra/newview/llpathfindingpathtool.h +++ b/indra/newview/llpathfindingpathtool.h @@ -27,7 +27,7 @@ #ifndef LL_LLPATHFINDINGPATHTOOL_H #define LL_LLPATHFINDINGPATHTOOL_H -#include <boost/function.hpp> +#include <functional> #include <boost/signals2.hpp> #include "llpathinglib.h" @@ -62,7 +62,7 @@ public: kCharacterTypeD } ECharacterType; - typedef boost::function<void (void)> path_event_callback_t; + typedef std::function<void(void)> path_event_callback_t; typedef boost::signals2::signal<void (void)> path_event_signal_t; typedef boost::signals2::connection path_event_slot_t; |