diff options
| author | Andrey Lihatskiy <118752495+marchcat@users.noreply.github.com> | 2025-12-03 22:28:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-03 22:28:01 +0200 |
| commit | 189ffd46e0316e333bc850f69eb7ed57dd7829e7 (patch) | |
| tree | 68fd14fac829ae5223919fa21d0ab580ad64af7b /indra/newview/llpathfindingnavmesh.h | |
| parent | b49400e0882a80dd2972a31cde2152ba979b2ce4 (diff) | |
| parent | 1e1f96e8e406d9b56e7b9246b9999e92434656af (diff) | |
Merge pull request #5101 from secondlife/marchcat/devlinux-2601
Merge 26.01 into develop-linux
Diffstat (limited to 'indra/newview/llpathfindingnavmesh.h')
| -rw-r--r-- | indra/newview/llpathfindingnavmesh.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpathfindingnavmesh.h b/indra/newview/llpathfindingnavmesh.h index d838a1a51c..44397c9118 100644 --- a/indra/newview/llpathfindingnavmesh.h +++ b/indra/newview/llpathfindingnavmesh.h @@ -27,9 +27,9 @@ #ifndef LL_LLPATHFINDINGNAVMESH_H #define LL_LLPATHFINDINGNAVMESH_H +#include <functional> #include <string> -#include <boost/function.hpp> #include <boost/signals2.hpp> #include "llpathfindingnavmeshstatus.h" @@ -54,7 +54,7 @@ public: kNavMeshRequestError } ENavMeshRequestStatus; - typedef boost::function<void (ENavMeshRequestStatus, const LLPathfindingNavMeshStatus &, const LLSD::Binary &)> navmesh_callback_t; + typedef std::function<void(ENavMeshRequestStatus, const LLPathfindingNavMeshStatus&, const LLSD::Binary&)> navmesh_callback_t; typedef boost::signals2::signal<void (ENavMeshRequestStatus, const LLPathfindingNavMeshStatus &, const LLSD::Binary &)> navmesh_signal_t; typedef boost::signals2::connection navmesh_slot_t; |