Merge remote-tracking branch 'secondlife/release/2026.01' into 2026.01

57 files changed, 241 insertions, 162 deletions

diff --git a/indra/llui/llaccordionctrl.cpp b/indra/llui/llaccordionctrl.cpp
index 2cd394476e..ac8f7c2126 100644
--- a/indra/llui/llaccordionctrl.cpp
+++ b/indra/llui/llaccordionctrl.cpp
@@ -47,6 +47,8 @@ static constexpr F32 AUTO_SCROLL_RATE_ACCEL = 120.f;
 
 static LLDefaultChildRegistry::Register<LLAccordionCtrl>    t2("accordion");
 
+std::set<LLAccordionCtrl*> LLAccordionCtrl::sPendingArrange;
+
 LLAccordionCtrl::LLAccordionCtrl(const Params& params):LLPanel(params)
  , mFitParent(params.fit_parent)
  , mNoVisibleTabsOrigString(params.no_visible_tabs_text.initial_value().asString())
@@ -163,7 +165,11 @@ bool LLAccordionCtrl::postBuild()
 //---------------------------------------------------------------------------------
 LLAccordionCtrl::~LLAccordionCtrl()
 {
-  mAccordionTabs.clear();
+    if (mArrangePending)
+    {
+        sPendingArrange.erase(this);
+    }
+    mAccordionTabs.clear();
 }
 
 //---------------------------------------------------------------------------------
@@ -184,7 +190,7 @@ void LLAccordionCtrl::reshape(S32 width, S32 height, bool called_from_parent)
     // necessary text paddings can be set via h_pad and v_pad
     mNoVisibleTabsHelpText->setRect(getLocalRect());
 
-    arrange();
+    scheduleArrange();
 }
 
 //---------------------------------------------------------------------------------
@@ -325,7 +331,7 @@ void LLAccordionCtrl::addCollapsibleCtrl(LLAccordionCtrlTab* accordion_tab)
     mAccordionTabs.push_back(accordion_tab);
 
     accordion_tab->setDropDownStateChangedCallback( boost::bind(&LLAccordionCtrl::onCollapseCtrlCloseOpen, this, (S16)(mAccordionTabs.size() - 1)) );
-    arrange();
+    scheduleArrange();
 }
 
 void LLAccordionCtrl::removeCollapsibleCtrl(LLAccordionCtrlTab* accordion_tab)
@@ -682,8 +688,9 @@ S32 LLAccordionCtrl::notifyParent(const LLSD& info)
         std::string str_action = info["action"];
         if (str_action == "size_changes")
         {
-            //
-            arrange();
+            // Multiple children can request an arrange,
+            // but only need to do it once so schedule it for later.
+            scheduleArrange();
             return 1;
         }
         if (str_action == "select_next")
@@ -925,3 +932,25 @@ void LLAccordionCtrl::collapseAllTabs()
         arrange();
     }
 }
+
+void LLAccordionCtrl::scheduleArrange()
+{
+    if (!mArrangePending)
+    {
+        mArrangePending = true;
+        sPendingArrange.insert(this);
+    }
+}
+
+void LLAccordionCtrl::updateClass()
+{
+    for (LLAccordionCtrl* inst : sPendingArrange)
+    {
+        if (inst)
+        {
+            inst->mArrangePending = false;
+            inst->arrange();
+        }
+    }
+    sPendingArrange.clear();
+}
diff --git a/indra/llui/llaccordionctrl.h b/indra/llui/llaccordionctrl.h
index 43a33a2b3c..c7bb8bc9ff 100644
--- a/indra/llui/llaccordionctrl.h
+++ b/indra/llui/llaccordionctrl.h
@@ -142,6 +142,9 @@ public:
 
     void setSkipScrollToChild(bool skip) { mSkipScrollToChild = skip; }
 
+    void scheduleArrange();
+    static void updateClass();
+
 private:
     void    initNoTabsWidget(const LLTextBox::Params& tb_params);
     void    updateNoTabsHelpTextVisibility();
@@ -188,12 +191,15 @@ private:
     LLTextBox*      mNoVisibleTabsHelpText = nullptr;
 
     bool            mSkipScrollToChild = false;
+    bool            mArrangePending = false;
 
     std::string     mNoMatchedTabsOrigString;
     std::string     mNoVisibleTabsOrigString;
 
     LLAccordionCtrlTab*     mSelectedTab = nullptr;
     const LLTabComparator*  mTabComparator = nullptr;
+
+    static std::set<LLAccordionCtrl*> sPendingArrange;
 };
 
 
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index d2534b3939..0048c44189 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -190,7 +190,7 @@ LLButton::LLButton(const LLButton::Params& p)
         // Note: flashing should be allowed in settings.xml (boolean key "EnableButtonFlashing").
         S32 flash_count = p.button_flash_count.isProvided()? p.button_flash_count : 0;
         F32 flash_rate = p.button_flash_rate.isProvided()? p.button_flash_rate : 0.0f;
-        mFlashingTimer = new LLFlashTimer ((LLFlashTimer::callback_t)NULL, flash_count, flash_rate);
+        mFlashingTimer  = new LLFlashTimer((LLFlashTimer::callback_t) nullptr, flash_count, flash_rate);
     }
     else
     {
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h
index 890e7c2d1e..f530eceb4b 100644
--- a/indra/llui/llbutton.h
+++ b/indra/llui/llbutton.h
@@ -153,7 +153,7 @@ public:
 
     ~LLButton();
     // For backward compatability only
-    typedef boost::function<void(void*)> button_callback_t;
+    typedef std::function<void(void*)> button_callback_t;
 
     void            addImageAttributeToXML(LLXMLNodePtr node, const std::string& imageName,
                                         const LLUUID&   imageID,const std::string&  xmlTagName) const;
diff --git a/indra/llui/llcallbackmap.h b/indra/llui/llcallbackmap.h
index 07775dc30f..3115606d91 100644
--- a/indra/llui/llcallbackmap.h
+++ b/indra/llui/llcallbackmap.h
@@ -29,13 +29,13 @@
 
 #include <map>
 #include <string>
-#include <boost/function.hpp>
+#include <functional>
 
 class LLCallbackMap
 {
 public:
     // callback definition.
-    typedef boost::function<void* (void* data)> callback_t;
+    typedef std::function<void* (void* data)> callback_t;
 
     typedef std::map<std::string, LLCallbackMap> map_t;
     typedef map_t::iterator map_iter_t;
@@ -48,8 +48,8 @@ public:
         return (void*)panel;
     }
 
-    LLCallbackMap() : mCallback(NULL), mData(NULL) { }
-    LLCallbackMap(callback_t callback, void* data = NULL) : mCallback(callback), mData(data) { }
+    LLCallbackMap() : mCallback(nullptr), mData(nullptr) {}
+    LLCallbackMap(callback_t callback, void* data = nullptr) : mCallback(callback), mData(data) {}
 
     callback_t  mCallback;
     void*       mData;
diff --git a/indra/llui/llclipboard.h b/indra/llui/llclipboard.h
index 12d8233e0a..9f9cc3e54d 100644
--- a/indra/llui/llclipboard.h
+++ b/indra/llui/llclipboard.h
@@ -27,8 +27,6 @@
 #ifndef LL_LLCLIPBOARD_H
 #define LL_LLCLIPBOARD_H
 
-#include <boost/function.hpp>
-
 #include "llstring.h"
 #include "lluuid.h"
 #include "llsingleton.h"
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index f3876ef695..ae676251ff 100644
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -1009,7 +1009,7 @@ void LLComboBox::setKeystrokeOnEsc(bool enable)
 
 void LLComboBox::onTextEntry(LLLineEditor* line_editor)
 {
-    if (mTextEntryCallback != NULL)
+    if (mTextEntryCallback != nullptr)
     {
         (mTextEntryCallback)(line_editor, LLSD());
     }
@@ -1029,7 +1029,7 @@ void LLComboBox::onTextEntry(LLLineEditor* line_editor)
             mList->deselectAllItems();
             mLastSelectedIndex = -1;
         }
-        if (mTextChangedCallback != NULL)
+        if (mTextChangedCallback != nullptr)
         {
             (mTextChangedCallback)(line_editor, LLSD());
         }
@@ -1077,7 +1077,7 @@ void LLComboBox::onTextEntry(LLLineEditor* line_editor)
         // RN: presumably text entry
         updateSelection();
     }
-    if (mTextChangedCallback != NULL)
+    if (mTextChangedCallback != nullptr)
     {
         (mTextChangedCallback)(line_editor, LLSD());
     }
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h
index 8be3eb57e4..d6ea1202d3 100644
--- a/indra/llui/llcombobox.h
+++ b/indra/llui/llcombobox.h
@@ -36,7 +36,6 @@
 #include "llrect.h"
 #include "llscrolllistctrl.h"
 #include "lllineeditor.h"
-#include <boost/function.hpp>
 
 // Classes
 
diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp
index 19ae03cdf9..c20e5a806c 100644
--- a/indra/llui/lldockablefloater.cpp
+++ b/indra/llui/lldockablefloater.cpp
@@ -77,7 +77,7 @@ LLDockableFloater::~LLDockableFloater()
 bool LLDockableFloater::postBuild()
 {
     // Remember we should force docking when the floater is opened for the first time
-    if (mIsDockedStateForcedCallback != NULL && mIsDockedStateForcedCallback())
+    if (mIsDockedStateForcedCallback != nullptr && mIsDockedStateForcedCallback())
     {
         mForceDocking = true;
     }
diff --git a/indra/llui/lldockablefloater.h b/indra/llui/lldockablefloater.h
index 9c516e23a4..accd9fddfc 100644
--- a/indra/llui/lldockablefloater.h
+++ b/indra/llui/lldockablefloater.h
@@ -129,7 +129,7 @@ protected:
 
     // Checks if docking should be forced.
     // It may be useful e.g. if floater created in mouselook mode (see EXT-5609)
-    boost::function<bool ()> mIsDockedStateForcedCallback;
+    std::function<bool()> mIsDockedStateForcedCallback;
 
 private:
     std::unique_ptr<LLDockControl> mDockControl;
diff --git a/indra/llui/lldockcontrol.h b/indra/llui/lldockcontrol.h
index b6ac9c19dd..1f6c3b9f57 100644
--- a/indra/llui/lldockcontrol.h
+++ b/indra/llui/lldockcontrol.h
@@ -49,11 +49,11 @@ public:
 
 public:
     // callback for a function getting a rect valid for control's position
-    typedef boost::function<void (LLRect& )> get_allowed_rect_callback_t;
+    typedef std::function<void (LLRect& )> get_allowed_rect_callback_t;
 
     LOG_CLASS(LLDockControl);
     LLDockControl(LLView* dockWidget, LLFloater* dockableFloater,
-            const LLUIImagePtr& dockTongue, DocAt dockAt, get_allowed_rect_callback_t get_rect_callback = NULL);
+            const LLUIImagePtr& dockTongue, DocAt dockAt, get_allowed_rect_callback_t get_rect_callback = nullptr);
     virtual ~LLDockControl();
 
 public:
diff --git a/indra/llui/llflashtimer.cpp b/indra/llui/llflashtimer.cpp
index 54f54653e2..addc3375b3 100644
--- a/indra/llui/llflashtimer.cpp
+++ b/indra/llui/llflashtimer.cpp
@@ -50,7 +50,7 @@ LLFlashTimer::LLFlashTimer(callback_t cb, S32 count, F32 period)
 void LLFlashTimer::unset()
 {
     mUnset = true;
-    mCallback = NULL;
+    mCallback = nullptr;
 }
 
 bool LLFlashTimer::tick()
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();
diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp
index dfe0a71b74..34eb1ea3fc 100644
--- a/indra/llui/llflatlistview.cpp
+++ b/indra/llui/llflatlistview.cpp
@@ -537,6 +537,7 @@ bool LLFlatListView::postBuild()
 
 void LLFlatListView::rearrangeItems()
 {
+    LL_PROFILE_ZONE_SCOPED;
     static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
 
     setNoItemsCommentVisible(0==size());
@@ -1132,6 +1133,7 @@ bool LLFlatListView::removeItemPair(item_pair_t* item_pair, bool rearrange)
 
 void LLFlatListView::notifyParentItemsRectChanged()
 {
+    LL_PROFILE_ZONE_SCOPED;
     S32 comment_height = 0;
 
     // take into account comment text height if exists
@@ -1401,7 +1403,7 @@ bool LLFlatListViewEx::updateItemVisibility(LLPanel* item, const LLSD &action)
     return false;
 }
 
-void LLFlatListViewEx::filterItems(bool re_sort, bool notify_parent)
+bool LLFlatListViewEx::filterItems(bool re_sort, bool notify_parent)
 {
     std::string cur_filter = mFilterSubString;
     LLStringUtil::toUpper(cur_filter);
@@ -1426,7 +1428,9 @@ void LLFlatListViewEx::filterItems(bool re_sort, bool notify_parent)
     {
         rearrangeItems();
         notifyParentItemsRectChanged();
+        return true;
     }
+    return false;
 }
 
 bool LLFlatListViewEx::hasMatchedItems()
diff --git a/indra/llui/llflatlistview.h b/indra/llui/llflatlistview.h
index 1f22360a8a..39afa33be8 100644
--- a/indra/llui/llflatlistview.h
+++ b/indra/llui/llflatlistview.h
@@ -499,8 +499,9 @@ public:
     /**
      * Filters the list, rearranges and notifies parent about shape changes.
      * Derived classes may want to overload rearrangeItems() to exclude repeated separators after filtration.
+     * Returns true in case of changes
      */
-    void filterItems(bool re_sort, bool notify_parent);
+    bool filterItems(bool re_sort, bool notify_parent);
 
     /**
      * Returns true if last call of filterItems() found at least one matching item
diff --git a/indra/llui/llfloaterreg.h b/indra/llui/llfloaterreg.h
index 94a67c8d8b..24d1476dda 100644
--- a/indra/llui/llfloaterreg.h
+++ b/indra/llui/llfloaterreg.h
@@ -30,8 +30,8 @@
 #include "llrect.h"
 #include "llsd.h"
 
+#include <functional>
 #include <list>
-#include <boost/function.hpp>
 
 //*******************************************************
 //
@@ -41,7 +41,7 @@
 class LLFloater;
 class LLUICtrl;
 
-typedef boost::function<LLFloater* (const LLSD& key)> LLFloaterBuildFunc;
+typedef std::function<LLFloater* (const LLSD& key)> LLFloaterBuildFunc;
 
 class LLFloaterReg
 {
diff --git a/indra/llui/llfocusmgr.cpp b/indra/llui/llfocusmgr.cpp
index 0d7c98294f..7544a44478 100644
--- a/indra/llui/llfocusmgr.cpp
+++ b/indra/llui/llfocusmgr.cpp
@@ -32,11 +32,11 @@
 
 const F32 FOCUS_FADE_TIME = 0.3f;
 
-LLFocusableElement::LLFocusableElement()
-:   mFocusLostCallback(NULL),
-    mFocusReceivedCallback(NULL),
-    mFocusChangedCallback(NULL),
-    mTopLostCallback(NULL)
+LLFocusableElement::LLFocusableElement() :
+    mFocusLostCallback(nullptr),
+    mFocusReceivedCallback(nullptr),
+    mFocusChangedCallback(nullptr),
+    mTopLostCallback(nullptr)
 {
 }
 
diff --git a/indra/llui/llfolderviewmodel.h b/indra/llui/llfolderviewmodel.h
index 2865b789b9..07e8b890b8 100644
--- a/indra/llui/llfolderviewmodel.h
+++ b/indra/llui/llfolderviewmodel.h
@@ -432,11 +432,11 @@ public:
 
     virtual SortType& getSorter()                    { return *mSorter; }
     virtual const SortType& getSorter() const        { return *mSorter; }
-    virtual void setSorter(const SortType& sorter)   { mSorter.reset(new SortType(sorter)); requestSortAll(); }
+    virtual void setSorter(const SortType& sorter)   { mSorter = std::make_unique<SortType>(sorter); requestSortAll(); }
 
     virtual FilterType& getFilter() override                  { return *mFilter; }
     virtual const FilterType& getFilter() const override      { return *mFilter; }
-    virtual void setFilter(const FilterType& filter) { mFilter.reset(new FilterType(filter)); }
+    virtual void setFilter(const FilterType& filter) { mFilter = std::make_unique<FilterType>(filter); }
 
     // By default, we assume the content is available. If a network fetch mechanism is implemented for the model,
     // this method needs to be overloaded and return the relevant fetch status.
diff --git a/indra/llui/llfunctorregistry.h b/indra/llui/llfunctorregistry.h
index da5570d922..953963b683 100644
--- a/indra/llui/llfunctorregistry.h
+++ b/indra/llui/llfunctorregistry.h
@@ -31,8 +31,6 @@
 #include <string>
 #include <map>
 
-#include <boost/function.hpp>
-
 #include "llsd.h"
 #include "llsingleton.h"
 
diff --git a/indra/llui/lllazyvalue.h b/indra/llui/lllazyvalue.h
index 622e69ce95..fc15ead032 100644
--- a/indra/llui/lllazyvalue.h
+++ b/indra/llui/lllazyvalue.h
@@ -28,15 +28,16 @@
 #ifndef LL_LAZY_VALUE_H
 #define LL_LAZY_VALUE_H
 
-#include <boost/function.hpp>
+#include <functional>
+#include <type_traits>
 
 // Holds on to a value of type T *or* calls a functor to generate a value of type T
 template<typename T>
 class LLLazyValue
 {
 public:
-    typedef typename boost::add_reference<typename boost::add_const<T>::type>::type T_const_ref;
-    typedef typename boost::function<T_const_ref (void)>                            function_type;
+    typedef typename std::add_lvalue_reference<typename std::add_const<T>::type>::type T_const_ref;
+    typedef typename std::function<T_const_ref (void)>                            function_type;
 
 public:
     LLLazyValue(const function_type& value)
diff --git a/indra/llui/lllineeditor.h b/indra/llui/lllineeditor.h
index 7533f76f1d..3f762822ee 100644
--- a/indra/llui/lllineeditor.h
+++ b/indra/llui/lllineeditor.h
@@ -60,7 +60,7 @@ class LLLineEditor
 {
 public:
 
-    typedef boost::function<void (LLLineEditor* caller)> keystroke_callback_t;
+    typedef std::function<void (LLLineEditor* caller)> keystroke_callback_t;
 
     struct MaxLength : public LLInitParam::ChoiceBlock<MaxLength>
     {
@@ -259,7 +259,7 @@ public:
     void            setSelectAllonCommit(bool b) { mSelectAllonCommit = b; }
 
     void            onKeystroke();
-    typedef boost::function<void (LLLineEditor* caller, void* user_data)> callback_t;
+    typedef std::function<void (LLLineEditor* caller, void* user_data)> callback_t;
     void            setKeystrokeCallback(callback_t callback, void* user_data);
 
     void            setMaxTextLength(S32 max_text_length);
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index ff9456acc6..eacf2c59d4 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -37,7 +37,8 @@
 #include "llfloater.h"
 #include "lluistring.h"
 #include "llview.h"
-#include <boost/function.hpp>
+
+#include <boost/bind.hpp>
 
 extern S32 MENU_BAR_HEIGHT;
 extern S32 MENU_BAR_WIDTH;
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp
index a05feab1d9..0ffe6cff5e 100644
--- a/indra/llui/llnotifications.cpp
+++ b/indra/llui/llnotifications.cpp
@@ -457,7 +457,7 @@ LLNotificationTemplate::LLNotificationTemplate(const LLNotificationTemplate::Par
         mTags.push_back(tag.value);
     }
 
-    mForm = LLNotificationFormPtr(new LLNotificationForm(p.name, p.form_ref.form));
+    mForm = std::make_shared<LLNotificationForm>(p.name, p.form_ref.form);
 }
 
 LLNotificationVisibilityRule::LLNotificationVisibilityRule(const LLNotificationVisibilityRule::Rule &p)
@@ -875,7 +875,7 @@ void LLNotification::init(const std::string& template_name, const LLSD& form_ele
     // TODO: something like this so that a missing alert is sensible:
     //mSubstitutions["_ARGS"] = get_all_arguments_as_text(mSubstitutions);
 
-    mForm = LLNotificationFormPtr(new LLNotificationForm(*mTemplatep->mForm));
+    mForm = std::make_shared<LLNotificationForm>(*mTemplatep->mForm);
     mForm->append(form_elements);
 
     // apply substitution to form labels
@@ -1249,7 +1249,7 @@ LLNotifications::LLNotifications()
 :   LLNotificationChannelBase(LLNotificationFilters::includeEverything),
     mIgnoreAllNotifications(false)
 {
-        mListener.reset(new LLNotificationsListener(*this));
+    mListener = std::make_unique<LLNotificationsListener>(*this);
     LLUICtrl::CommitCallbackRegistry::currentRegistrar().add("Notification.Show", boost::bind(&LLNotifications::addFromCallback, this, _2));
 
     // touch the instance tracker for notification channels, so that it will still be around in our destructor
@@ -1487,7 +1487,7 @@ bool LLNotifications::templateExists(std::string_view name)
 
 void LLNotifications::forceResponse(const LLNotification::Params& params, S32 option)
 {
-    LLNotificationPtr temp_notify(new LLNotification(params));
+    LLNotificationPtr temp_notify = std::make_shared<LLNotification>(params);
 
     if (!temp_notify->getForm())
     {
@@ -1653,7 +1653,7 @@ bool LLNotifications::loadTemplates()
                 replaceFormText(notification.form_ref.form, "$ignoretext", notification.form_ref.form_template.ignore_text);
             }
         }
-        mTemplates[notification.name] = LLNotificationTemplatePtr(new LLNotificationTemplate(notification));
+        mTemplates[notification.name] = std::make_shared<LLNotificationTemplate>(notification);
     }
 
     LL_INFOS("Notifications") << "...done" << LL_ENDL;
@@ -1683,7 +1683,7 @@ bool LLNotifications::loadVisibilityRules()
 
     for (const LLNotificationVisibilityRule::Rule& rule : params.rules)
     {
-        mVisibilityRules.push_back(LLNotificationVisibilityRulePtr(new LLNotificationVisibilityRule(rule)));
+        mVisibilityRules.push_back(std::make_shared<LLNotificationVisibilityRule>(rule));
     }
 
     return true;
@@ -1726,7 +1726,7 @@ LLNotificationPtr LLNotifications::add(const std::string& name, const LLSD& subs
 // generalized add function that takes a parameter block object for more complex instantiations
 LLNotificationPtr LLNotifications::add(const LLNotification::Params& p)
 {
-    LLNotificationPtr pNotif(new LLNotification(p));
+    LLNotificationPtr pNotif = std::make_shared<LLNotification>(p);
     add(pNotif);
     return pNotif;
 }
@@ -1834,7 +1834,7 @@ void LLNotifications::update(const LLNotificationPtr pNotif)
 
 LLNotificationPtr LLNotifications::find(LLUUID uuid)
 {
-    LLNotificationPtr target = LLNotificationPtr(new LLNotification(LLNotification::Params().id(uuid)));
+    LLNotificationPtr target = std::make_shared<LLNotification>(LLNotification::Params().id(uuid));
     LLNotificationSet::iterator it=mItems.find(target);
     if (it == mItems.end())
     {
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index 3c8e1e85fa..d56c459560 100644
--- a/indra/llui/llnotifications.h
+++ b/indra/llui/llnotifications.h
@@ -75,6 +75,7 @@
  *
  */
 
+#include <functional>
 #include <string>
 #include <list>
 #include <vector>
@@ -83,8 +84,6 @@
 #include <iomanip>
 #include <sstream>
 
-#include <boost/utility.hpp>
-#include <boost/type_traits.hpp>
 #include <boost/signals2.hpp>
 #include <boost/range.hpp>
 #include <boost/intrusive_ptr.hpp>
@@ -129,7 +128,7 @@ public:
     virtual void fromLLSD(const LLSD& params) = 0;
 };
 
-typedef boost::function<void (const LLSD&, const LLSD&)> LLNotificationResponder;
+typedef std::function<void (const LLSD&, const LLSD&)> LLNotificationResponder;
 
 typedef std::shared_ptr<LLNotificationResponderInterface> LLNotificationResponderPtr;
 
@@ -303,7 +302,6 @@ typedef std::shared_ptr<LLNotificationVisibilityRule> LLNotificationVisibilityRu
  * shared pointer.
  */
 class LLNotification  :
-    boost::noncopyable,
     public std::enable_shared_from_this<LLNotification>
 {
 LOG_CLASS(LLNotification);
@@ -429,6 +427,10 @@ private:
 public:
     LLNotification(const LLSDParamAdapter<Params>& p);
 
+    // Non-copyable
+    LLNotification(const LLNotification&) = delete;
+    LLNotification& operator=(const LLNotification&) = delete;
+
     void setResponseFunctor(std::string const &responseFunctorName);
 
     void setResponseFunctor(const LLNotificationFunctorRegistry::ResponseFunctor& cb);
@@ -666,8 +668,8 @@ namespace LLNotificationFilters
     template<typename T>
     struct filterBy
     {
-        typedef boost::function<T (LLNotificationPtr)>  field_t;
-        typedef typename boost::remove_reference<T>::type       value_t;
+        typedef std::function<T (LLNotificationPtr)>  field_t;
+        typedef typename std::remove_reference<T>::type       value_t;
 
         filterBy(field_t field, value_t value, EComparison comparison = EQUAL)
             :   mField(field),
@@ -712,7 +714,7 @@ namespace LLNotificationComparators
     };
 };
 
-typedef boost::function<bool (LLNotificationPtr)> LLNotificationFilter;
+typedef std::function<bool (LLNotificationPtr)> LLNotificationFilter;
 typedef std::set<LLNotificationPtr, LLNotificationComparators::orderByUUID> LLNotificationSet;
 typedef std::multimap<std::string, LLNotificationPtr> LLNotificationMap;
 
@@ -817,10 +819,9 @@ typedef boost::intrusive_ptr<LLNotificationChannel> LLNotificationChannelPtr;
 // manages a list of notifications
 // Note that if this is ever copied around, we might find ourselves with multiple copies
 // of a queue with notifications being added to different nonequivalent copies. So we
-// make it inherit from boost::noncopyable, and then create a map of LLPointer to manage it.
+// delete the copy operator and constructor, and then create a map of LLPointer to manage it.
 //
 class LLNotificationChannel :
-    boost::noncopyable,
     public LLNotificationChannelBase,
     public LLInstanceTracker<LLNotificationChannel, std::string>
 {
@@ -843,6 +844,10 @@ public:
     virtual ~LLNotificationChannel();
     typedef LLNotificationSet::iterator Iterator;
 
+    // Non-copyable
+    LLNotificationChannel(const LLNotificationChannel&) = delete;
+    LLNotificationChannel& operator=(const LLNotificationChannel&) = delete;
+
     std::string getName() const { return mName; }
     typedef std::vector<std::string>::const_iterator parents_iter;
     boost::iterator_range<parents_iter> getParents() const
@@ -854,7 +859,7 @@ public:
     S32 size() const;
     size_t size();
 
-    typedef boost::function<void(LLNotificationPtr)> NotificationProcess;
+    typedef std::function<void(LLNotificationPtr)> NotificationProcess;
     void forEachNotification(NotificationProcess process);
 
     std::string summarize();
diff --git a/indra/llui/llnotificationslistener.cpp b/indra/llui/llnotificationslistener.cpp
index 9c1fc27c51..d07d42bdba 100644
--- a/indra/llui/llnotificationslistener.cpp
+++ b/indra/llui/llnotificationslistener.cpp
@@ -266,7 +266,7 @@ void LLNotificationsListener::forward(const LLSD& params)
         entry(mForwarders.insert(ForwarderMap::value_type(channel, ForwarderMap::mapped_type())).first);
     if (! entry->second)
     {
-        entry->second.reset(new Forwarder(mNotifications, channel));
+        entry->second = std::make_shared<Forwarder>(mNotifications, channel);
     }
     // Now, whether this Forwarder is brand-new or not, update it with the new
     // request info.
diff --git a/indra/llui/llnotificationsutil.cpp b/indra/llui/llnotificationsutil.cpp
index c1cad431c5..6b570d043f 100644
--- a/indra/llui/llnotificationsutil.cpp
+++ b/indra/llui/llnotificationsutil.cpp
@@ -71,7 +71,7 @@ LLNotificationPtr LLNotificationsUtil::add(const std::string& name,
 LLNotificationPtr LLNotificationsUtil::add(const std::string& name,
                       const LLSD& substitutions,
                       const LLSD& payload,
-                      boost::function<void (const LLSD&, const LLSD&)> functor)
+                      std::function<void (const LLSD&, const LLSD&)> functor)
 {
     LLNotification::Params::Functor functor_p;
     functor_p.function = functor;
diff --git a/indra/llui/llnotificationsutil.h b/indra/llui/llnotificationsutil.h
index f21d93a50e..73e64e47ba 100644
--- a/indra/llui/llnotificationsutil.h
+++ b/indra/llui/llnotificationsutil.h
@@ -32,7 +32,7 @@
 #include "llnotificationptr.h"
 #include "lluuid.h"
 
-#include <boost/function.hpp>
+#include <functional>
 
 class LLSD;
 
@@ -55,7 +55,7 @@ namespace LLNotificationsUtil
     LLNotificationPtr add(const std::string& name,
                           const LLSD& substitutions,
                           const LLSD& payload,
-                          boost::function<void (const LLSD&, const LLSD&)> functor);
+                          std::function<void (const LLSD&, const LLSD&)> functor);
 
     S32 getSelectedOption(const LLSD& notification, const LLSD& response);
 
diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp
index db314cae0f..2100b23783 100644
--- a/indra/llui/llpanel.cpp
+++ b/indra/llui/llpanel.cpp
@@ -662,12 +662,12 @@ bool LLPanel::childHasFocus(std::string_view id)
 // Prefer getChild<LLUICtrl>("foo")->setCommitCallback(boost:bind(...)),
 // which takes a generic slot.  Or use mCommitCallbackRegistrar.add() with
 // a named callback and reference it in XML.
-void LLPanel::childSetCommitCallback(std::string_view id, boost::function<void (LLUICtrl*,void*)> cb, void* data)
+void LLPanel::childSetCommitCallback(std::string_view id, std::function<void (LLUICtrl*,void*)> cb, void* data)
 {
     LLUICtrl* child = findChild<LLUICtrl>(id);
     if (child)
     {
-        child->setCommitCallback(boost::bind(cb, child, data));
+        child->setCommitCallback(std::bind(cb, child, data));
     }
 }
 
@@ -759,12 +759,12 @@ void LLPanel::childSetAction(std::string_view id, const commit_signal_t::slot_ty
     }
 }
 
-void LLPanel::childSetAction(std::string_view id, boost::function<void(void*)> function, void* value)
+void LLPanel::childSetAction(std::string_view id, std::function<void(void*)> function, void* value)
 {
     LLButton* button = findChild<LLButton>(id);
     if (button)
     {
-        button->setClickedCallback(boost::bind(function, value));
+        button->setClickedCallback(std::bind(function, value));
     }
 }
 
diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h
index f085c123c1..fe861dc719 100644
--- a/indra/llui/llpanel.h
+++ b/indra/llui/llpanel.h
@@ -191,7 +191,7 @@ public:
     // Prefer getChild<LLUICtrl>("foo")->setCommitCallback(boost:bind(...)),
     // which takes a generic slot.  Or use mCommitCallbackRegistrar.add() with
     // a named callback and reference it in XML.
-    void childSetCommitCallback(std::string_view id, boost::function<void (LLUICtrl*,void*)> cb, void* data);
+    void childSetCommitCallback(std::string_view id, std::function<void (LLUICtrl*,void*)> cb, void* data);
     void childSetColor(std::string_view id, const LLUIColor& color);
 
     LLCtrlSelectionInterface* childGetSelectionInterface(std::string_view id) const;
@@ -208,7 +208,7 @@ public:
     bool childSetLabelArg(std::string_view id, const std::string& key, const LLStringExplicit& text);
 
     // LLButton
-    void childSetAction(std::string_view id, boost::function<void(void*)> function, void* value);
+    void childSetAction(std::string_view id, std::function<void(void*)> function, void* value);
     void childSetAction(std::string_view id, const commit_signal_t::slot_type& function);
 
     static LLView*  fromXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr output_node = NULL);
@@ -262,7 +262,7 @@ extern template class LLPanel* LLView::getChild<class LLPanel>(
     std::string_view name, bool recurse) const;
 #endif
 
-typedef boost::function<LLPanel* (void)> LLPanelClassCreatorFunc;
+typedef std::function<LLPanel* (void)> LLPanelClassCreatorFunc;
 
 // local static instance for registering a particular panel class
 
diff --git a/indra/llui/llresizebar.h b/indra/llui/llresizebar.h
index 68bf0fd95e..d95536c360 100644
--- a/indra/llui/llresizebar.h
+++ b/indra/llui/llresizebar.h
@@ -62,7 +62,7 @@ public:
     void            setEnableSnapping(bool enable) { mSnappingEnabled = enable; }
     void            setAllowDoubleClickSnapping(bool allow) { mAllowDoubleClickSnapping = allow; }
     bool            canResize() const { return getEnabled() && mMaxSize > mMinSize; }
-    void            setResizeListener(boost::function<void(void*)> listener) {mResizeListener = listener;}
+    void            setResizeListener(std::function<void(void*)> listener) { mResizeListener = listener; }
     void            setImagePanel(LLPanel * panelp);
     LLPanel *       getImagePanel() const;
 
@@ -78,7 +78,7 @@ private:
     bool                            mSnappingEnabled,
                                     mAllowDoubleClickSnapping;
     LLView*                         mResizingView;
-    boost::function<void(void*)>    mResizeListener;
+    std::function<void(void*)>    mResizeListener;
     LLPointer<LLUIImage>            mDragHandleImage;
     LLPanel *                       mImagePanel;
 };
diff --git a/indra/llui/llscrollbar.h b/indra/llui/llscrollbar.h
index 9607355a9d..c49d2b534a 100644
--- a/indra/llui/llscrollbar.h
+++ b/indra/llui/llscrollbar.h
@@ -40,7 +40,7 @@ class LLScrollbar
 {
 public:
 
-    typedef boost::function<void (S32, LLScrollbar*)> callback_t;
+    typedef std::function<void (S32, LLScrollbar*)> callback_t;
     struct Params
     :   public LLInitParam::Block<Params, LLUICtrl::Params>
     {
diff --git a/indra/llui/llscrolllistcell.cpp b/indra/llui/llscrolllistcell.cpp
index a3108d77e8..bdf88768c3 100644
--- a/indra/llui/llscrolllistcell.cpp
+++ b/indra/llui/llscrolllistcell.cpp
@@ -98,6 +98,7 @@ const LLSD LLScrollListCell::getAltValue() const
 LLScrollListIcon::LLScrollListIcon(const LLScrollListCell::Params& p)
 :   LLScrollListCell(p),
     mIcon(LLUI::getUIImage(p.value().asString())),
+    mIconSize(0),
     mColor(p.color),
     mAlignment(p.font_halign)
 {}
@@ -140,20 +141,32 @@ void LLScrollListIcon::setValue(const LLSD& value)
     }
 }
 
-
 void LLScrollListIcon::setColor(const LLColor4& color)
 {
     mColor = color;
 }
 
+void LLScrollListIcon::setIconSize(S32 size)
+{
+    mIconSize = size;
+}
+
 S32 LLScrollListIcon::getWidth() const
 {
     // if no specified fix width, use width of icon
-    if (LLScrollListCell::getWidth() == 0 && mIcon.notNull())
+    if (LLScrollListCell::getWidth() != 0)
+    {
+        return LLScrollListCell::getWidth();
+    }
+    if (mIconSize != 0)
+    {
+        return mIconSize;
+    }
+    if (mIcon.notNull())
     {
         return mIcon->getWidth();
     }
-    return LLScrollListCell::getWidth();
+    return 0;
 }
 
 
@@ -161,16 +174,23 @@ void LLScrollListIcon::draw(const LLColor4& color, const LLColor4& highlight_col
 {
     if (mIcon)
     {
+        S32 draw_width = mIcon->getWidth();
+        S32 draw_height = mIcon->getHeight();
+        if (mIconSize != 0)
+        {
+            draw_width = mIconSize;
+            draw_height = mIconSize;
+        } // else will draw full icon even if cell is smaller
         switch(mAlignment)
         {
         case LLFontGL::LEFT:
-            mIcon->draw(0, 0, mColor);
+            mIcon->draw(0, 0, draw_width, draw_height, mColor);
             break;
         case LLFontGL::RIGHT:
-            mIcon->draw(getWidth() - mIcon->getWidth(), 0, mColor);
+            mIcon->draw(getWidth() - draw_width, 0, draw_width, draw_height, mColor);
             break;
         case LLFontGL::HCENTER:
-            mIcon->draw((getWidth() - mIcon->getWidth()) / 2, 0, mColor);
+            mIcon->draw((getWidth() - draw_width) / 2, 0, draw_width, draw_height, mColor);
             break;
         default:
             break;
diff --git a/indra/llui/llscrolllistcell.h b/indra/llui/llscrolllistcell.h
index 7dded3c0b7..f0a0f216b4 100644
--- a/indra/llui/llscrolllistcell.h
+++ b/indra/llui/llscrolllistcell.h
@@ -197,11 +197,13 @@ public:
     /*virtual*/ const LLSD      getValue() const;
     /*virtual*/ void    setColor(const LLColor4&);
     /*virtual*/ void    setValue(const LLSD& value);
+    void                setIconSize(S32 size);
 
 private:
     LLPointer<LLUIImage>    mIcon;
     LLColor4                mColor;
     LLFontGL::HAlign        mAlignment;
+    S32                     mIconSize;
 };
 
 
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index ff77b4d482..b459c67dad 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -190,19 +190,19 @@ LLScrollListCtrl::LLScrollListCtrl(const LLScrollListCtrl::Params& p)
     mColumnsDirty(false),
     mMaxItemCount(INT_MAX),
     mBorderThickness( 2 ),
-    mOnDoubleClickCallback( NULL ),
-    mOnMaximumSelectCallback( NULL ),
-    mOnSortChangedCallback( NULL ),
+    mOnDoubleClickCallback(nullptr),
+    mOnMaximumSelectCallback(nullptr),
+    mOnSortChangedCallback(nullptr),
     mHighlightedItem(-1),
-    mBorder(NULL),
-    mSortCallback(NULL),
+    mBorder(nullptr),
+    mSortCallback(nullptr),
     mNumDynamicWidthColumns(0),
     mTotalStaticColumnWidth(0),
     mTotalColumnPadding(0),
     mSorted(false),
     mDirty(false),
     mOriginalSelection(-1),
-    mLastSelected(NULL),
+    mLastSelected(nullptr),
     mHeadingHeight(p.heading_height),
     mAllowMultipleSelection(p.multi_select),
     mDisplayColumnHeaders(p.draw_heading),
@@ -222,7 +222,7 @@ LLScrollListCtrl::LLScrollListCtrl(const LLScrollListCtrl::Params& p)
     mRowPadding(p.row_padding),
     mAlternateSort(false),
     mContextMenuType(MENU_NONE),
-    mIsFriendSignal(NULL)
+    mIsFriendSignal(nullptr)
 {
     mItemListRect.setOriginAndSize(
         mBorderThickness,
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);
diff --git a/indra/llui/llsearcheditor.cpp b/indra/llui/llsearcheditor.cpp
index a0c1e9d0c0..244faf8fe9 100644
--- a/indra/llui/llsearcheditor.cpp
+++ b/indra/llui/llsearcheditor.cpp
@@ -106,12 +106,12 @@ LLSearchEditor::LLSearchEditor(const LLSearchEditor::Params& p)
 
 LLSearchEditor::~LLSearchEditor()
 {
-    mKeystrokeCallback = NULL;
-    mTextChangedCallback = NULL;
+    mKeystrokeCallback   = nullptr;
+    mTextChangedCallback = nullptr;
     setCommitOnFocusLost(false);
 
-    mSearchButton = NULL;
-    mClearButton = NULL;
+    mSearchButton = nullptr;
+    mClearButton  = nullptr;
     mSearchEditor->deleteAllChildren();
     deleteAllChildren();
 }
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 44151a4355..2079ff17fc 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -3477,7 +3477,6 @@ S32 LLTextSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offs
 void LLTextSegment::updateLayout(const LLTextBase& editor) {}
 F32 LLTextSegment::draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRectf& draw_rect) { return draw_rect.mLeft; }
 bool LLTextSegment::canEdit() const { return false; }
-bool LLTextSegment::getPermitsEmoji() const { return true; }
 void LLTextSegment::unlinkFromDocument(LLTextBase*) {}
 void LLTextSegment::linkToDocument(LLTextBase*) {}
 const LLUIColor& LLTextSegment::getColor() const { static const LLUIColor white = LLUIColorTable::instance().getColor("White", LLColor4::white); return white; }
@@ -3521,6 +3520,11 @@ LLNormalTextSegment::LLNormalTextSegment( LLStyleConstSP style, S32 start, S32 e
 {
     mFontHeight = mStyle->getFont()->getLineHeight();
     mCanEdit = !mStyle->getDrawHighlightBg();
+    if (!mCanEdit)
+    {
+        // Emoji shouldn't split the segment with the mention.
+        mPermitsEmoji = false;
+    }
 
     LLUIImagePtr image = mStyle->getImage();
     if (image.notNull())
@@ -4041,6 +4045,7 @@ LLInlineViewSegment::LLInlineViewSegment(const Params& p, S32 start, S32 end)
     mTopPad(p.top_pad),
     mBottomPad(p.bottom_pad)
 {
+    mPermitsEmoji = false;
 }
 
 LLInlineViewSegment::~LLInlineViewSegment()
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index 50767a35b3..3ab5e905e3 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -61,13 +61,15 @@ class LLTextSegment
 public:
     LLTextSegment(S32 start, S32 end)
     :   mStart(start),
-        mEnd(end)
+        mEnd(end),
+        mPermitsEmoji(true)
     {}
     virtual ~LLTextSegment();
     virtual LLTextSegmentPtr clone(LLTextBase& terget) const { return new LLTextSegment(mStart, mEnd); }
     static LLStyleSP cloneStyle(LLTextBase& target, const LLStyle* source);
 
     bool                        getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const;
+    bool                        getPermitsEmoji() const { return mPermitsEmoji; };
 
     virtual bool                getDimensionsF32(S32 first_char, S32 num_chars, F32& width, S32& height) const;
     virtual S32                 getOffset(S32 segment_local_x_coord, S32 start_offset, S32 num_chars, bool round) const;
@@ -87,7 +89,6 @@ public:
     virtual void                updateLayout(const class LLTextBase& editor);
     virtual F32                 draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRectf& draw_rect);
     virtual bool                canEdit() const;
-    virtual bool                getPermitsEmoji() const;
     virtual void                unlinkFromDocument(class LLTextBase* editor);
     virtual void                linkToDocument(class LLTextBase* editor);
 
@@ -126,6 +127,8 @@ public:
 protected:
     S32             mStart;
     S32             mEnd;
+
+    bool            mPermitsEmoji;
 };
 
 class LLNormalTextSegment : public LLTextSegment
diff --git a/indra/llui/lltextbox.cpp b/indra/llui/lltextbox.cpp
index 9f945d3735..d2a21998a6 100644
--- a/indra/llui/lltextbox.cpp
+++ b/indra/llui/lltextbox.cpp
@@ -43,7 +43,7 @@ template class LLTextBox* LLView::getChild<class LLTextBox>(
 
 LLTextBox::LLTextBox(const LLTextBox::Params& p)
 :   LLTextBase(p),
-    mClickedCallback(NULL),
+    mClickedCallback(nullptr),
     mShowCursorHand(true)
 {
     mSkipTripleClick = true;
@@ -135,9 +135,9 @@ void LLTextBox::setText(const LLStringExplicit& text , const LLStyle::Params& in
     LLTextBase::setText(mText.getString(), input_params );
 }
 
-void LLTextBox::setClickedCallback( boost::function<void (void*)> cb, void* userdata /*= NULL */ )
+void LLTextBox::setClickedCallback(std::function<void (void*)> cb, void* userdata /*= nullptr */)
 {
-    mClickedCallback = boost::bind(cb, userdata);
+    mClickedCallback = std::bind(cb, userdata);
 }
 
 S32 LLTextBox::getTextPixelWidth()
diff --git a/indra/llui/lltextbox.h b/indra/llui/lltextbox.h
index 507d8f3ee6..8716917ced 100644
--- a/indra/llui/lltextbox.h
+++ b/indra/llui/lltextbox.h
@@ -36,7 +36,7 @@ class LLTextBox :
 public:
 
     // *TODO: Add callback to Params
-    typedef boost::function<void (void)> callback_t;
+    typedef std::function<void (void)> callback_t;
 
     struct Params : public LLInitParam::Block<Params, LLTextBase::Params>
     {};
@@ -58,7 +58,7 @@ public:
 
     void setRightAlign() { mHAlign = LLFontGL::RIGHT; }
     void setHAlign(LLFontGL::HAlign align) { mHAlign = align; }
-    void setClickedCallback(boost::function<void(void*)> cb, void* userdata = NULL);
+    void setClickedCallback(std::function<void(void*)> cb, void* userdata = nullptr);
 
     void reshapeToFitText(bool called_from_parent = false);
 
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 58b785fcdd..fcdf3782ae 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -1242,7 +1242,7 @@ void LLTextEditor::addChar(llwchar wc)
     tryToShowEmojiHelper();
     tryToShowMentionHelper();
 
-    if (!mReadOnly && mAutoreplaceCallback != NULL)
+    if (!mReadOnly && mAutoreplaceCallback != nullptr)
     {
         // autoreplace the text, if necessary
         S32 replacement_start;
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index cdfcbcdd63..d9742db34d 100644
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -164,7 +164,7 @@ public:
     bool            allowsEmbeddedItems() const { return mAllowEmbeddedItems; }
 
     // Autoreplace (formerly part of LLLineEditor)
-    typedef boost::function<void(S32&, S32&, LLWString&, S32&, const LLWString&)> autoreplace_callback_t;
+    typedef std::function<void(S32&, S32&, LLWString&, S32&, const LLWString&)> autoreplace_callback_t;
     autoreplace_callback_t mAutoreplaceCallback;
     void            setAutoreplaceCallback(autoreplace_callback_t cb) { mAutoreplaceCallback = cb; }
 
diff --git a/indra/llui/lltextutil.cpp b/indra/llui/lltextutil.cpp
index 8ffce1b8b4..1454de34c7 100644
--- a/indra/llui/lltextutil.cpp
+++ b/indra/llui/lltextutil.cpp
@@ -30,7 +30,7 @@
 #include "lltextbox.h"
 #include "llurlmatch.h"
 
-boost::function<bool(LLUrlMatch*,LLTextBase*)>  LLTextUtil::TextHelpers::iconCallbackCreationFunction = 0;
+std::function<bool(LLUrlMatch*, LLTextBase*)> LLTextUtil::TextHelpers::iconCallbackCreationFunction = nullptr;
 
 void LLTextUtil::textboxSetHighlightedVal(LLTextBox *txtbox, const LLStyle::Params& normal_style, const std::string& text, const std::string& hl)
 {
diff --git a/indra/llui/lltextutil.h b/indra/llui/lltextutil.h
index f3838e59fa..6328ff133f 100644
--- a/indra/llui/lltextutil.h
+++ b/indra/llui/lltextutil.h
@@ -74,7 +74,7 @@ namespace LLTextUtil
         //we need this special callback since we need to create LLAvataIconCtrls while parsing
         //avatar/group url but can't create LLAvataIconCtrl from LLUI
         public:
-            static boost::function<bool(LLUrlMatch*,LLTextBase*)> iconCallbackCreationFunction;
+            static std::function<bool(LLUrlMatch*,LLTextBase*)> iconCallbackCreationFunction;
     };
 
 
diff --git a/indra/llui/lltextvalidate.h b/indra/llui/lltextvalidate.h
index a4ff144d82..096c28b448 100644
--- a/indra/llui/lltextvalidate.h
+++ b/indra/llui/lltextvalidate.h
@@ -30,7 +30,6 @@
 
 #include "llstring.h"
 #include "llinitparam.h"
-#include <boost/function.hpp>
 
 namespace LLTextValidate
 {
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp
index 56ab6e9bae..785dc85448 100644
--- a/indra/llui/lltoolbar.cpp
+++ b/indra/llui/lltoolbar.cpp
@@ -99,8 +99,8 @@ LLToolBar::LLToolBar(const LLToolBar::Params& p)
     mWrap(p.wrap),
     mNeedsLayout(false),
     mModified(false),
-    mButtonPanel(NULL),
-    mCenteringStack(NULL),
+    mButtonPanel(nullptr),
+    mCenteringStack(nullptr),
     mPadLeft(p.pad_left),
     mPadRight(p.pad_right),
     mPadTop(p.pad_top),
@@ -108,17 +108,17 @@ LLToolBar::LLToolBar(const LLToolBar::Params& p)
     mPadBetween(p.pad_between),
     mMinGirth(p.min_girth),
     mPopupMenuHandle(),
-    mRightMouseTargetButton(NULL),
-    mStartDragItemCallback(NULL),
-    mHandleDragItemCallback(NULL),
-    mHandleDropCallback(NULL),
-    mButtonAddSignal(NULL),
-    mButtonEnterSignal(NULL),
-    mButtonLeaveSignal(NULL),
-    mButtonRemoveSignal(NULL),
+    mRightMouseTargetButton(nullptr),
+    mStartDragItemCallback(nullptr),
+    mHandleDragItemCallback(nullptr),
+    mHandleDropCallback(nullptr),
+    mButtonAddSignal(nullptr),
+    mButtonEnterSignal(nullptr),
+    mButtonLeaveSignal(nullptr),
+    mButtonRemoveSignal(nullptr),
     mDragAndDropTarget(false),
-    mCaretIcon(NULL),
-    mCenterPanel(NULL)
+    mCaretIcon(nullptr),
+    mCenterPanel(nullptr)
 {
     mButtonParams[LLToolBarEnums::BTNTYPE_ICONS_WITH_TEXT] = p.button_icon_and_text;
     mButtonParams[LLToolBarEnums::BTNTYPE_ICONS_ONLY] = p.button_icon;
@@ -1097,12 +1097,12 @@ LLToolBarButton::LLToolBarButton(const Params& p)
     mWidthRange(p.button_width),
     mDesiredHeight(p.desired_height),
     mId(""),
-    mIsEnabledSignal(NULL),
-    mIsRunningSignal(NULL),
-    mIsStartingSignal(NULL),
+    mIsEnabledSignal(nullptr),
+    mIsRunningSignal(nullptr),
+    mIsStartingSignal(nullptr),
     mIsDragged(false),
-    mStartDragItemCallback(NULL),
-    mHandleDragItemCallback(NULL),
+    mStartDragItemCallback(nullptr),
+    mHandleDragItemCallback(nullptr),
     mOriginalImageSelected(p.image_selected),
     mOriginalImageUnselected(p.image_unselected),
     mOriginalImagePressed(p.image_pressed),
@@ -1256,7 +1256,7 @@ void LLToolBar::LLCenterLayoutPanel::handleReshape(const LLRect& rect, bool by_u
 {
     LLLayoutPanel::handleReshape(rect, by_user);
 
-    if (!mReshapeCallback.empty())
+    if (mReshapeCallback != nullptr)
     {
         LLRect r;
         localRectToOtherView(mButtonPanel->getRect(), &r, gFloaterView);
diff --git a/indra/llui/lltoolbar.h b/indra/llui/lltoolbar.h
index a3f044c256..abf44f259a 100644
--- a/indra/llui/lltoolbar.h
+++ b/indra/llui/lltoolbar.h
@@ -39,9 +39,9 @@ class LLToolBar;
 class LLToolBarButton;
 class LLIconCtrl;
 
-typedef boost::function<void (S32 x, S32 y, LLToolBarButton* button)> tool_startdrag_callback_t;
-typedef boost::function<bool (S32 x, S32 y, const LLUUID& uuid, LLAssetType::EType type)> tool_handledrag_callback_t;
-typedef boost::function<bool (void* data, EDragAndDropType cargo_type, S32 x, S32 y, LLToolBar* toolbar)> tool_handledrop_callback_t;
+typedef std::function<void (S32 x, S32 y, LLToolBarButton* button)> tool_startdrag_callback_t;
+typedef std::function<bool (S32 x, S32 y, const LLUUID& uuid, LLAssetType::EType type)> tool_handledrag_callback_t;
+typedef std::function<bool (void* data, EDragAndDropType cargo_type, S32 x, S32 y, LLToolBar* toolbar)> tool_handledrop_callback_t;
 
 class LLToolBarButton : public LLButton
 {
@@ -167,7 +167,7 @@ public:
     class LLCenterLayoutPanel : public LLLayoutPanel
     {
     public:
-        typedef boost::function<void(LLToolBarEnums::EToolBarLocation tb, const LLRect& rect)> reshape_callback_t;
+        typedef std::function<void(LLToolBarEnums::EToolBarLocation tb, const LLRect& rect)> reshape_callback_t;
 
         virtual ~LLCenterLayoutPanel() {}
         /*virtual*/ void handleReshape(const LLRect& rect, bool by_user);
diff --git a/indra/llui/lltooltip.h b/indra/llui/lltooltip.h
index 760acddd6f..c9d6937c1a 100644
--- a/indra/llui/lltooltip.h
+++ b/indra/llui/lltooltip.h
@@ -67,8 +67,8 @@ public:
 
     struct Params : public LLInitParam::Block<Params, LLPanel::Params>
     {
-        typedef boost::function<void(void)> click_callback_t;
-        typedef boost::function<LLToolTip*(LLToolTip::Params)> create_callback_t;
+        typedef std::function<void(void)> click_callback_t;
+        typedef std::function<LLToolTip*(LLToolTip::Params)> create_callback_t;
 
         Optional<std::string>       message;
         Multiple<StyledText>        styled_message;
diff --git a/indra/llui/llui.h b/indra/llui/llui.h
index b2dcb6dc88..2ef64baaf6 100644
--- a/indra/llui/llui.h
+++ b/indra/llui/llui.h
@@ -241,9 +241,9 @@ public:
     //
     // Methods
     //
-    typedef boost::function<void(LLView*)> add_popup_t;
-    typedef boost::function<void(LLView*)> remove_popup_t;
-    typedef boost::function<void(void)> clear_popups_t;
+    typedef std::function<void(LLView*)> add_popup_t;
+    typedef std::function<void(LLView*)> remove_popup_t;
+    typedef std::function<void(void)> clear_popups_t;
 
     void setPopupFuncs(const add_popup_t& add_popup, const remove_popup_t&, const clear_popups_t& );
 
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp
index cbabb5a933..05461edd82 100644
--- a/indra/llui/lluictrl.cpp
+++ b/indra/llui/lluictrl.cpp
@@ -999,15 +999,16 @@ bool LLUICtrl::findHelpTopic(std::string& help_topic_out)
 }
 
 // *TODO: Deprecate; for backwards compatability only:
-boost::signals2::connection LLUICtrl::setCommitCallback( boost::function<void (LLUICtrl*,void*)> cb, void* data)
+boost::signals2::connection LLUICtrl::setCommitCallback( std::function<void (LLUICtrl*,void*)> cb, void* data)
 {
-    return setCommitCallback( boost::bind(cb, _1, data));
+    return setCommitCallback( std::bind(cb, std::placeholders::_1, data));
 }
-boost::signals2::connection LLUICtrl::setValidateBeforeCommit( boost::function<bool (const LLSD& data)> cb )
+
+boost::signals2::connection LLUICtrl::setValidateBeforeCommit( std::function<bool (const LLSD& data)> cb )
 {
     if (!mValidateSignal) mValidateSignal = new enable_signal_t();
 
-    return mValidateSignal->connect(boost::bind(cb, _2));
+    return mValidateSignal->connect(std::bind(cb, std::placeholders::_2));
 }
 
 // virtual
diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h
index bcaf479b0f..749999bbfe 100644
--- a/indra/llui/lluictrl.h
+++ b/indra/llui/lluictrl.h
@@ -31,7 +31,8 @@
 //#include "llboost.h"
 #include "llrect.h"
 #include "llsd.h"
-#include <boost/function.hpp>
+#include <functional>
+#include <boost/bind.hpp>
 #include <boost/signals2.hpp>
 
 #include "llinitparam.h"
@@ -47,12 +48,12 @@ class LLUICtrl
     : public LLView, public boost::signals2::trackable
 {
 public:
-    typedef boost::function<void (LLUICtrl* ctrl, const LLSD& param)> commit_callback_t;
+    typedef std::function<void (LLUICtrl* ctrl, const LLSD& param)> commit_callback_t;
     typedef boost::signals2::signal<void (LLUICtrl* ctrl, const LLSD& param)> commit_signal_t;
     // *TODO: add xml support for this type of signal in the future
     typedef boost::signals2::signal<void (LLUICtrl* ctrl, S32 x, S32 y, MASK mask)> mouse_signal_t;
 
-    typedef boost::function<bool (LLUICtrl* ctrl, const LLSD& param)> enable_callback_t;
+    typedef std::function<bool (LLUICtrl* ctrl, const LLSD& param)> enable_callback_t;
     typedef boost::signals2::signal<bool (LLUICtrl* ctrl, const LLSD& param), boost_boolean_combiner> enable_signal_t;
 
     struct CallbackParam : public LLInitParam::Block<CallbackParam>
@@ -258,8 +259,8 @@ public:
     boost::signals2::connection setDoubleClickCallback( const mouse_signal_t::slot_type& cb );
 
     // *TODO: Deprecate; for backwards compatability only:
-    boost::signals2::connection setCommitCallback( boost::function<void (LLUICtrl*,void*)> cb, void* data);
-    boost::signals2::connection setValidateBeforeCommit( boost::function<bool (const LLSD& data)> cb );
+    boost::signals2::connection setCommitCallback( std::function<void (LLUICtrl*,void*)> cb, void* data);
+    boost::signals2::connection setValidateBeforeCommit( std::function<bool (const LLSD& data)> cb );
 
     LLUICtrl* findRootMostFocusRoot();
 
diff --git a/indra/llui/lluictrlfactory.cpp b/indra/llui/lluictrlfactory.cpp
index a2a6d661ff..9abccfd9a0 100644
--- a/indra/llui/lluictrlfactory.cpp
+++ b/indra/llui/lluictrlfactory.cpp
@@ -100,16 +100,19 @@ void LLUICtrlFactory::loadWidgetTemplate(const std::string& widget_tag, LLInitPa
     std::string base_filename = search_paths.front();
     if (!base_filename.empty())
     {
-        LLUICtrlFactory::instance().pushFileName(base_filename);
+        LLUICtrlFactory *factory = LLUICtrlFactory::getInstance();
+        factory->mFileNames.push_back(base_filename);
 
-        if (!LLXMLNode::getLayeredXMLNode(root_node, search_paths))
+        if (LLXMLNode::getLayeredXMLNode(root_node, search_paths))
+        {
+            LLXUIParser parser;
+            parser.readXUI(root_node, block, base_filename);
+        }
+        else
         {
             LL_WARNS() << "Couldn't parse widget from: " << base_filename << LL_ENDL;
-            return;
         }
-        LLXUIParser parser;
-        parser.readXUI(root_node, block, base_filename);
-        LLUICtrlFactory::instance().popFileName();
+        factory->mFileNames.pop_back();
     }
 }
 
diff --git a/indra/llui/lluictrlfactory.h b/indra/llui/lluictrlfactory.h
index 91221dc7f3..fc069c078f 100644
--- a/indra/llui/lluictrlfactory.h
+++ b/indra/llui/lluictrlfactory.h
@@ -311,7 +311,7 @@ LLUICtrlFactory::ParamDefaults<LLInitParam::BaseBlock, DUMMY>::ParamDefaults() {
 template<typename DERIVED>
 template<typename T>
 LLChildRegistry<DERIVED>::Register<T>::Register(const char* tag, LLWidgetCreatorFunc func)
-:   LLChildRegistry<DERIVED>::StaticRegistrar(tag, func.empty() ? (LLWidgetCreatorFunc)&LLUICtrlFactory::defaultBuilder<T> : func)
+:   LLChildRegistry<DERIVED>::StaticRegistrar(tag, func == nullptr ? (LLWidgetCreatorFunc)&LLUICtrlFactory::defaultBuilder<T> : func)
 {
     // add this widget to various registries
     LLUICtrlFactory::instance().registerWidget(&typeid(T), &typeid(typename T::Params), tag);
diff --git a/indra/llui/llurlaction.h b/indra/llui/llurlaction.h
index 56d459bb26..c4cfd0f3fb 100644
--- a/indra/llui/llurlaction.h
+++ b/indra/llui/llurlaction.h
@@ -28,8 +28,8 @@
 #ifndef LL_LLURLACTION_H
 #define LL_LLURLACTION_H
 
+#include <functional>
 #include <string>
-#include <boost/function.hpp>
 
 ///
 /// The LLUrlAction class provides a number of static functions that
@@ -93,8 +93,8 @@ public:
     static void unblockObject(std::string url);
 
     /// specify the callbacks to enable this class's functionality
-    typedef boost::function<void (const std::string&)> url_callback_t;
-    typedef boost::function<bool(const std::string& url, bool trusted_content)> execute_url_callback_t;
+    typedef std::function<void (const std::string&)> url_callback_t;
+    typedef std::function<bool(const std::string& url, bool trusted_content)> execute_url_callback_t;
 
     static void setOpenURLCallback(url_callback_t cb);
     static void setOpenURLInternalCallback(url_callback_t cb);
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index 95603d7ed5..bba80dd20e 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -234,7 +234,7 @@ bool LLUrlEntryBase::isWikiLinkCorrect(const std::string &labeled_url) const
          || label.find("www.") != std::string::npos)
         && label.find("://") == std::string::npos)
     {
-        label = "http://" + label;
+        label = "https://" + label;
     }
 
     return !LLUrlRegistry::instance().hasUrl(label);
@@ -315,7 +315,7 @@ std::string LLUrlEntryHTTP::getUrl(const std::string &string) const
 {
     if (string.find("://") == std::string::npos)
     {
-        return "http://" + escapeUrl(string);
+        return "https://" + escapeUrl(string);
     }
     return escapeUrl(string);
 }
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index 97212a9d2d..d747ef9555 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -48,9 +48,8 @@
 #include "lltreeiterators.h"
 #include "llfocusmgr.h"
 
+#include <functional>
 #include <list>
-#include <boost/function.hpp>
-#include <boost/noncopyable.hpp>
 
 class LLSD;
 
@@ -627,7 +626,7 @@ private:
     LLView& getDefaultWidgetContainer() const;
 
     // This allows special mouse-event targeting logic for testing.
-    typedef boost::function<bool(const LLView*, S32 x, S32 y)> DrilldownFunc;
+    typedef std::function<bool(const LLView*, S32 x, S32 y)> DrilldownFunc;
     static DrilldownFunc sDrilldown;
 
 public:
@@ -637,7 +636,7 @@ public:
     //     LLView::TemporaryDrilldownFunc scoped_func(myfunctor);
     //     // ... test with myfunctor ...
     // } // exiting block restores original LLView::sDrilldown
-    class TemporaryDrilldownFunc: public boost::noncopyable
+    class TemporaryDrilldownFunc
     {
     public:
         TemporaryDrilldownFunc(const DrilldownFunc& func):
@@ -651,6 +650,10 @@ public:
             sDrilldown = mOldDrilldown;
         }
 
+        // Non-copyable
+        TemporaryDrilldownFunc(const TemporaryDrilldownFunc&) = delete;
+        TemporaryDrilldownFunc& operator=(const TemporaryDrilldownFunc&) = delete;
+
     private:
         DrilldownFunc mOldDrilldown;
     };
diff --git a/indra/llui/llxuiparser.h b/indra/llui/llxuiparser.h
index f755c12cbf..2179ae54d3 100644
--- a/indra/llui/llxuiparser.h
+++ b/indra/llui/llxuiparser.h
@@ -31,7 +31,7 @@
 #include "llregistry.h"
 #include "llxmlnode.h"
 
-#include <boost/function.hpp>
+#include <functional>
 #include <iosfwd>
 #include <stack>
 #include <set>
@@ -47,7 +47,7 @@ class LLWidgetTypeRegistry
 
 
 // global static instance for registering all widget types
-typedef boost::function<LLView* (LLXMLNodePtr node, LLView *parent, LLXMLNodePtr output_node)> LLWidgetCreatorFunc;
+typedef std::function<LLView* (LLXMLNodePtr node, LLView *parent, LLXMLNodePtr output_node)> LLWidgetCreatorFunc;
 
 typedef LLRegistry<std::string, LLWidgetCreatorFunc> widget_registry_t;