Merge branch 'develop' into maxim/voice-moderation

1 files changed, 2 insertions, 2 deletions

diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h
index 1f04100306..d3735c5052 100644
--- a/indra/llui/llscrolllistctrl.h
+++ b/indra/llui/llscrolllistctrl.h
@@ -77,7 +77,7 @@ public:
     };
 
     // *TODO: Add callbacks to Params
-    typedef boost::function<void (void)> callback_t;
+    typedef std::function<void (void)> callback_t;
 
     template<typename T> struct maximum
     {
@@ -241,7 +241,7 @@ public:
     void            setMaximumSelectCallback( callback_t cb) { mOnMaximumSelectCallback = cb; }
     void            setSortChangedCallback( callback_t cb)  { mOnSortChangedCallback = cb; }
     // Convenience function; *TODO: replace with setter above + boost::bind() in calling code
-    void            setDoubleClickCallback( boost::function<void (void* userdata)> cb, void* userdata) { mOnDoubleClickCallback = boost::bind(cb, userdata); }
+    void            setDoubleClickCallback( std::function<void (void* userdata)> cb, void* userdata) { mOnDoubleClickCallback = std::bind(cb, userdata); }
 
     void            swapWithNext(S32 index);
     void            swapWithPrevious(S32 index);