Merge pull request #5097 from secondlife/release/2026.01

2026.01

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/llui/llflashtimer.h b/indra/llui/llflashtimer.h
index 4ef70faf2d..1cd1df392b 100644
--- a/indra/llui/llflashtimer.h
+++ b/indra/llui/llflashtimer.h
@@ -28,13 +28,13 @@
 #define LL_FLASHTIMER_H
 
 #include "lleventtimer.h"
-#include "boost/function.hpp"
+#include <functional>
 
 class LLFlashTimer : public LLEventTimer
 {
 public:
 
-    typedef boost::function<void (bool)> callback_t;
+    typedef std::function<void (bool)> callback_t;
 
     /**
      * Constructor.
@@ -43,7 +43,7 @@ public:
      * @param period - how frequently callback should be called
      * @param cb - callback to be called each tick
      */
-    LLFlashTimer(callback_t cb = NULL, S32 count = 0, F32 period = 0.0);
+    LLFlashTimer(callback_t cb = nullptr, S32 count = 0, F32 period = 0.0);
     ~LLFlashTimer() {};
 
     /*virtual*/ bool tick();