Merge pull request #5097 from secondlife/release/2026.01

2026.01

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/llcorehttp/httprequest.h b/indra/llcorehttp/httprequest.h
index e6e051410e..f7516f127a 100644
--- a/indra/llcorehttp/httprequest.h
+++ b/indra/llcorehttp/httprequest.h
@@ -104,9 +104,9 @@ public:
 
     /// Represents a default, catch-all policy class that guarantees
     /// eventual service for any HTTP request.
-    static const policy_t DEFAULT_POLICY_ID = 0;
-    static const policy_t INVALID_POLICY_ID = 0xFFFFFFFFU;
-    static const policy_t GLOBAL_POLICY_ID = 0xFFFFFFFEU;
+    static constexpr policy_t DEFAULT_POLICY_ID = 0;
+    static constexpr policy_t INVALID_POLICY_ID = 0xFFFFFFFFU;
+    static constexpr policy_t GLOBAL_POLICY_ID = 0xFFFFFFFEU;
 
     /// Create a new policy class into which requests can be made.
     ///
@@ -237,7 +237,7 @@ public:
 
     /// Prototype for policy based callbacks.  The callback methods will be executed
     /// on the worker thread so no modifications should be made to the HttpHandler object.
-    typedef boost::function<HttpStatus(const std::string &, const HttpHandler::ptr_t &, void *)> policyCallback_t;
+    typedef std::function<HttpStatus(const std::string &, const HttpHandler::ptr_t &, void *)> policyCallback_t;
 
     /// Set a policy option for a global or class parameter at
     /// startup time (prior to thread start).