3 files changed, 4 insertions, 4 deletions
diff --git a/indra/llinventory/lllandmark.h b/indra/llinventory/lllandmark.h
index 75596dc287..75520195ec 100644
--- a/indra/llinventory/lllandmark.h
+++ b/indra/llinventory/lllandmark.h
@@ -28,8 +28,8 @@
 #ifndef LL_LLLANDMARK_H
 #define LL_LLLANDMARK_H
 
+#include <functional>
 #include <map>
-#include <boost/function.hpp>
 #include "llframetimer.h"
 #include "lluuid.h"
 #include "v3dmath.h"
@@ -41,7 +41,7 @@ class LLLandmark
 {
 public:
     // for calling back interested parties when a region handle comes back.
-    typedef boost::function<void(const LLUUID& region_id, const U64& region_handle)> region_handle_callback_t;
+    typedef std::function<void(const LLUUID& region_id, const U64& region_handle)> region_handle_callback_t;
 
     ~LLLandmark() {}
 
diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp
index d7a94d61a5..031029531c 100644
--- a/indra/llinventory/llsettingsbase.cpp
+++ b/indra/llinventory/llsettingsbase.cpp
@@ -598,7 +598,7 @@ bool LLSettingsBase::Validator::verify(LLSD &data, U32 flags)
         return false;
     }
 
-    if (!mVerify.empty() && !mVerify(data[mName], flags))
+    if (mVerify != nullptr && !mVerify(data[mName], flags))
     {
         LL_WARNS("SETTINGS") << "Setting '" << mName << "' fails validation." << LL_ENDL;
         return false;
diff --git a/indra/llinventory/llsettingsbase.h b/indra/llinventory/llsettingsbase.h
index e8160b1503..20979bd98e 100644
--- a/indra/llinventory/llsettingsbase.h
+++ b/indra/llinventory/llsettingsbase.h
@@ -288,7 +288,7 @@ public:
     public:
         static const U32 VALIDATION_PARTIAL;
 
-        typedef boost::function<bool(LLSD &, U32)> verify_pr;
+        typedef std::function<bool(LLSD &, U32)> verify_pr;
 
         Validator(std::string name, bool required, LLSD::Type type, verify_pr verify = verify_pr(), LLSD defval = LLSD())  :
             mName(name),