13 files changed, 20 insertions, 339 deletions

diff --git a/indra/llui/llaccordionctrltab.h b/indra/llui/llaccordionctrltab.h
index bb0b8ce04f..3fdcf9f7f2 100644
--- a/indra/llui/llaccordionctrltab.h
+++ b/indra/llui/llaccordionctrltab.h
@@ -140,7 +140,7 @@ public:
     S32 notify(const LLSD& info);
     bool notifyChildren(const LLSD& info);
 
-    virtual void draw();
+    void draw();
 
     void storeOpenCloseState();
     void restoreOpenCloseState();
diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp
index 5be20bd314..8178bada42 100644
--- a/indra/llui/llflatlistview.cpp
+++ b/indra/llui/llflatlistview.cpp
@@ -1346,17 +1346,9 @@ bool LLFlatListViewEx::getForceShowingUnmatchedItems() const
     return mForceShowingUnmatchedItems;
 }
 
-void LLFlatListViewEx::setForceShowingUnmatchedItems(bool show, bool notify_parent)
-{
-    if (mForceShowingUnmatchedItems != show)
+void LLFlatListViewEx::setForceShowingUnmatchedItems(bool show)
 {
     mForceShowingUnmatchedItems = show;
-        if (!mFilterSubString.empty())
-        {
-            updateNoItemsMessage(mFilterSubString);
-            filterItems(false, true);
-        }
-    }
 }
 
 void LLFlatListViewEx::setFilterSubString(const std::string& filter_str, bool notify_parent)
@@ -1424,7 +1416,6 @@ void LLFlatListViewEx::filterItems(bool re_sort, bool notify_parent)
 
     if (visibility_changed && notify_parent)
     {
-        rearrangeItems();
         notifyParentItemsRectChanged();
     }
 }
diff --git a/indra/llui/llflatlistview.h b/indra/llui/llflatlistview.h
index 1f22360a8a..6271231183 100644
--- a/indra/llui/llflatlistview.h
+++ b/indra/llui/llflatlistview.h
@@ -484,11 +484,7 @@ public:
 
     bool getForceShowingUnmatchedItems() const;
 
-    /**
-     * Sets filtered out items to stay visible. Can result in rect changes,
-     * so can notify_parent if rect changes
-     */
-    void setForceShowingUnmatchedItems(bool show, bool notify_parent);
+    void setForceShowingUnmatchedItems(bool show);
 
     /**
      * Sets up new filter string and filters the list.
diff --git a/indra/llui/llfolderview.h b/indra/llui/llfolderview.h
index 368a86ea84..bdce9dec54 100644
--- a/indra/llui/llfolderview.h
+++ b/indra/llui/llfolderview.h
@@ -221,7 +221,6 @@ public:
     void scrollToShowSelection();
     void scrollToShowItem(LLFolderViewItem* item, const LLRect& constraint_rect);
     void setScrollContainer( LLScrollContainer* parent ) { mScrollContainer = parent; }
-    LLScrollContainer* getScrollContainer() { return mScrollContainer; }
     LLRect getVisibleRect();
 
     bool search(LLFolderViewItem* first_item, const std::string &search_string, bool backward);
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 9ca77dbe46..6d0cfcba95 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -31,12 +31,11 @@
 #include "llfolderviewitem.h"
 #include "llfolderview.h"
 #include "llfolderviewmodel.h"
+#include "llpanel.h"
 #include "llcallbacklist.h"
 #include "llcriticaldamp.h"
 #include "llclipboard.h"
 #include "llfocusmgr.h"     // gFocusMgr
-#include "llnotificationsutil.h"
-#include "llpanel.h"
 #include "lltrans.h"
 #include "llwindow.h"
 
@@ -61,11 +60,7 @@ LLUIColor LLFolderViewItem::sSearchStatusColor;
 S32 LLFolderViewItem::sTopPad = 0;
 LLUIImagePtr LLFolderViewItem::sFolderArrowImg;
 LLUIImagePtr LLFolderViewItem::sSelectionImg;
-LLUIImagePtr LLFolderViewItem::sFavoriteImg;
-LLUIImagePtr LLFolderViewItem::sFavoriteContentImg;
 LLFontGL* LLFolderViewItem::sSuffixFont = nullptr;
-LLUIColor LLFolderViewItem::sFavoriteColor;
-bool LLFolderViewItem::sColorSetInitialized = false;
 
 // only integers can be initialized in header
 const F32 LLFolderViewItem::FOLDER_CLOSE_TIME_CONSTANT = 0.02f;
@@ -73,9 +68,6 @@ const F32 LLFolderViewItem::FOLDER_OPEN_TIME_CONSTANT = 0.03f;
 
 const LLColor4U DEFAULT_WHITE(255, 255, 255);
 
-constexpr S32 FAVORITE_IMAGE_SIZE = 14;
-constexpr S32 FAVORITE_IMAGE_PAD = 3;
-
 
 //static
 LLFontGL* LLFolderViewItem::getLabelFontForStyle(U8 style)
@@ -110,8 +102,6 @@ void LLFolderViewItem::initClass()
     sTopPad = default_params.item_top_pad;
     sFolderArrowImg = default_params.folder_arrow_image;
     sSelectionImg = default_params.selection_image;
-    sFavoriteImg = default_params.favorite_image;
-    sFavoriteContentImg = default_params.favorite_content_image;
     sSuffixFont = getLabelFontForStyle(LLFontGL::NORMAL);
 
     sFgColor = LLUIColorTable::instance().getColor("MenuItemEnabledColor", DEFAULT_WHITE);
@@ -131,8 +121,6 @@ void LLFolderViewItem::cleanupClass()
     sFonts.clear();
     sFolderArrowImg = nullptr;
     sSelectionImg = nullptr;
-    sFavoriteImg = nullptr;
-    sFavoriteContentImg = nullptr;
     sSuffixFont = nullptr;
 }
 
@@ -141,15 +129,13 @@ void LLFolderViewItem::cleanupClass()
 LLFolderViewItem::Params::Params()
 :   root(),
     listener(),
-    favorite_image("favorite_image"),
-    favorite_content_image("favorite_content_image"),
     folder_arrow_image("folder_arrow_image"),
     folder_indentation("folder_indentation"),
     selection_image("selection_image"),
     item_height("item_height"),
     item_top_pad("item_top_pad"),
     creation_date(),
-    marketplace_item("marketplace_item", false),
+    allow_wear("allow_wear", true),
     allow_drop("allow_drop", true),
     font_color("font_color"),
     font_highlight_color("font_highlight_color"),
@@ -169,8 +155,6 @@ LLFolderViewItem::LLFolderViewItem(const LLFolderViewItem::Params& p)
 :   LLView(p),
     mLabelWidth(0),
     mLabelWidthDirty(false),
-    mIsFavorite(false),
-    mHasFavorites(false),
     mSuffixNeedsRefresh(false),
     mLabelPaddingRight(DEFAULT_LABEL_PADDING_RIGHT),
     mParentFolder( NULL ),
@@ -191,7 +175,7 @@ LLFolderViewItem::LLFolderViewItem(const LLFolderViewItem::Params& p)
     mRoot(p.root),
     mViewModelItem(p.listener),
     mIsMouseOverTitle(false),
-    mMarketplaceItem(p.marketplace_item),
+    mAllowWear(p.allow_wear),
     mAllowDrop(p.allow_drop),
     mFontColor(p.font_color),
     mFontHighlightColor(p.font_highlight_color),
@@ -205,21 +189,6 @@ LLFolderViewItem::LLFolderViewItem(const LLFolderViewItem::Params& p)
     mMaxFolderItemOverlap(p.max_folder_item_overlap),
     mDoubleClickOverride(p.double_click_override)
 {
-    if (!sColorSetInitialized)
-    {
-        sFgColor = LLUIColorTable::instance().getColor("MenuItemEnabledColor", DEFAULT_WHITE);
-        sHighlightBgColor = LLUIColorTable::instance().getColor("MenuItemHighlightBgColor", DEFAULT_WHITE);
-        sFlashBgColor = LLUIColorTable::instance().getColor("MenuItemFlashBgColor", DEFAULT_WHITE);
-        sFocusOutlineColor = LLUIColorTable::instance().getColor("InventoryFocusOutlineColor", DEFAULT_WHITE);
-        sMouseOverColor = LLUIColorTable::instance().getColor("InventoryMouseOverColor", DEFAULT_WHITE);
-        sFilterBGColor = LLUIColorTable::instance().getColor("FilterBackgroundColor", DEFAULT_WHITE);
-        sFilterTextColor = LLUIColorTable::instance().getColor("FilterTextColor", DEFAULT_WHITE);
-        sSuffixColor = LLUIColorTable::instance().getColor("InventoryItemLinkColor", DEFAULT_WHITE);
-        sSearchStatusColor = LLUIColorTable::instance().getColor("InventorySearchStatusColor", DEFAULT_WHITE);
-        sFavoriteColor = LLUIColorTable::instance().getColor("InventoryFavoriteColor", DEFAULT_WHITE);
-        sColorSetInitialized = true;
-    }
-
     if (mViewModelItem)
     {
         mViewModelItem->setFolderViewItem(this);
@@ -242,7 +211,6 @@ bool LLFolderViewItem::postBuild()
         // getDisplayName() is expensive (due to internal getLabelSuffix() and name building)
         // it also sets search strings so it requires a filter reset
         mLabel = utf8str_to_wstring(vmi->getDisplayName());
-        mIsFavorite = vmi->isFavorite() && !vmi->isItemInTrash();
         setToolTip(vmi->getName());
 
         // Dirty the filter flag of the model from the view (CHUI-849)
@@ -357,7 +325,6 @@ void LLFolderViewItem::refresh()
 
     mLabel = utf8str_to_wstring(vmi.getDisplayName());
     mLabelFontBuffer.reset();
-    mIsFavorite = vmi.isFavorite() && !vmi.isItemInTrash();
     setToolTip(vmi.getName());
     // icons are slightly expensive to get, can be optimized
     // see LLInventoryIcon::getIcon()
@@ -392,8 +359,6 @@ void LLFolderViewItem::refreshSuffix()
     mIconOpen = vmi->getIconOpen();
     mIconOverlay = vmi->getIconOverlay();
 
-    mIsFavorite = vmi->isFavorite() && !vmi->isItemInTrash();
-
     if (mRoot->useLabelSuffix())
     {
         // Very Expensive!
@@ -463,10 +428,6 @@ S32 LLFolderViewItem::arrange( S32* width, S32* height )
         }
         mLabelWidth = getLabelXPos() + getLabelFontForStyle(mLabelStyle)->getWidth(mLabel.c_str()) + getLabelFontForStyle(LLFontGL::NORMAL)->getWidth(mLabelSuffix.c_str()) + mLabelPaddingRight;
         mLabelWidthDirty = false;
-        if (mIsFavorite)
-        {
-            mLabelWidth += FAVORITE_IMAGE_SIZE + FAVORITE_IMAGE_PAD;
-        }
     }
 
     *width = llmax(*width, mLabelWidth);
@@ -593,15 +554,10 @@ void LLFolderViewItem::buildContextMenu(LLMenuGL& menu, U32 flags)
 
 void LLFolderViewItem::openItem( void )
 {
-    if (!mMarketplaceItem || !getViewModelItem()->isItemWearable())
+    if (mAllowWear || !getViewModelItem()->isItemWearable())
     {
         getViewModelItem()->openItem();
     }
-    else if (mMarketplaceItem)
-    {
-        // Wearing an object from any listing, active or not, is verbotten
-        LLNotificationsUtil::add("AlertMerchantListingCannotWear");
-    }
 }
 
 void LLFolderViewItem::rename(const std::string& new_name)
@@ -815,45 +771,6 @@ void LLFolderViewItem::drawOpenFolderArrow()
     }
 }
 
-void LLFolderViewItem::drawFavoriteIcon()
-{
-    static LLUICachedControl<bool> draw_star("InventoryFavoritesUseStar", true);
-    static LLUICachedControl<bool> draw_hollow_star("InventoryFavoritesUseHollowStar", true);
-
-    LLUIImage* favorite_image = nullptr;
-    if (draw_star && mIsFavorite)
-    {
-        favorite_image = sFavoriteImg;
-    }
-    else if (draw_hollow_star && mHasFavorites && !isOpen())
-    {
-        favorite_image = sFavoriteContentImg;
-    }
-
-    if (favorite_image)
-    {
-        S32 x_offset = 0;
-        LLScrollContainer* scroll = mRoot->getScrollContainer();
-        if (scroll)
-        {
-            S32 width = scroll->getVisibleContentRect().getWidth();
-            S32 offset = scroll->getDocPosHorizontal();
-            x_offset = width + offset;
-        }
-        else
-        {
-            x_offset = getRect().getWidth();
-        }
-        gl_draw_scaled_image(
-            x_offset - FAVORITE_IMAGE_SIZE - FAVORITE_IMAGE_PAD,
-            getRect().getHeight() - mItemHeight + FAVORITE_IMAGE_PAD,
-            FAVORITE_IMAGE_SIZE,
-            FAVORITE_IMAGE_SIZE,
-            favorite_image->getImage(),
-            sFgColor);
-    }
-}
-
 /*virtual*/ bool LLFolderViewItem::isHighlightAllowed()
 {
     return mIsSelected;
@@ -1011,7 +928,6 @@ void LLFolderViewItem::draw()
     {
         drawOpenFolderArrow();
     }
-    drawFavoriteIcon();
 
     drawHighlight(show_context, filled, sHighlightBgColor, sFlashBgColor, sFocusOutlineColor, sMouseOverColor);
 
@@ -1083,20 +999,7 @@ void LLFolderViewItem::draw()
         }
     }
 
-    static LLUICachedControl<bool> highlight_color("InventoryFavoritesColorText", true);
-    LLColor4 color;
-    if (mIsSelected && filled)
-    {
-        color = mFontHighlightColor;
-    }
-    else if (mIsFavorite && highlight_color)
-    {
-        color = sFavoriteColor;
-    }
-    else
-    {
-        color = mFontColor;
-    }
+    LLColor4 color = (mIsSelected && filled) ? mFontHighlightColor : mFontColor;
 
     if (isFadeItem())
     {
@@ -1190,8 +1093,7 @@ LLFolderViewFolder::LLFolderViewFolder( const LLFolderViewItem::Params& p ):
     mIsFolderComplete(false), // folder might have children that are not loaded yet.
     mAreChildrenInited(false), // folder might have children that are not built yet.
     mLastArrangeGeneration( -1 ),
-    mLastCalculatedWidth(0),
-    mFavoritesDirtyFlags(0)
+    mLastCalculatedWidth(0)
 {
 }
 
@@ -1217,11 +1119,6 @@ LLFolderViewFolder::~LLFolderViewFolder( void )
     // The LLView base class takes care of object destruction. make sure that we
     // don't have mouse or keyboard focus
     gFocusMgr.releaseFocusIfNeeded( this ); // calls onCommit()
-
-    if (mFavoritesDirtyFlags)
-    {
-        gIdleCallbacks.deleteFunction(&LLFolderViewFolder::onIdleUpdateFavorites, this);
-    }
 }
 
 // addToFolder() returns true if it succeeds. false otherwise
@@ -1865,140 +1762,6 @@ bool LLFolderViewFolder::isMovable()
     return true;
 }
 
-void LLFolderViewFolder::updateHasFavorites(bool new_childs_value)
-{
-    if (mFavoritesDirtyFlags == 0)
-    {
-        gIdleCallbacks.addFunction(&LLFolderViewFolder::onIdleUpdateFavorites, this);
-    }
-    if (new_childs_value)
-    {
-        mFavoritesDirtyFlags |= FAVORITE_ADDED;
-    }
-    else
-    {
-        mFavoritesDirtyFlags |= FAVORITE_REMOVED;
-    }
-}
-
-void LLFolderViewFolder::onIdleUpdateFavorites(void* data)
-{
-    LLFolderViewFolder* self = reinterpret_cast<LLFolderViewFolder*>(data);
-    if (self->mFavoritesDirtyFlags == 0)
-    {
-        // already processed either on previous run or by a different callback
-        gIdleCallbacks.deleteFunction(&LLFolderViewFolder::onIdleUpdateFavorites, self);
-        return;
-    }
-
-    if (self->getViewModelItem()->isItemInTrash())
-    {
-        // do not display favorite-stars in trash
-        self->mFavoritesDirtyFlags = 0;
-        gIdleCallbacks.deleteFunction(&LLFolderViewFolder::onIdleUpdateFavorites, self);
-        return;
-    }
-
-    if (self->mFavoritesDirtyFlags == FAVORITE_ADDED)
-    {
-        if (!self->mHasFavorites)
-        {
-            // propagate up, exclude root
-            LLFolderViewFolder* parent = self;
-            while (parent
-                && (!parent->hasFavorites() || parent->mFavoritesDirtyFlags)
-                && !parent->getViewModelItem()->isAgentInventoryRoot())
-            {
-                parent->setHasFavorites(true);
-                if (parent->mFavoritesDirtyFlags)
-                {
-                    // Parent will remove onIdleUpdateFavorites later, don't remove now,
-                    // We are inside gIdleCallbacks. Removing 'self' callback is safe,
-                    // but removing 'parent' can invalidate following iterator
-                    parent->mFavoritesDirtyFlags = 0;
-                }
-                parent = parent->getParentFolder();
-            }
-        }
-        else
-        {
-            // already up to date
-            self->mFavoritesDirtyFlags = 0;
-            gIdleCallbacks.deleteFunction(&LLFolderViewFolder::onIdleUpdateFavorites, self);
-        }
-    }
-    else if (self->mFavoritesDirtyFlags > FAVORITE_ADDED)
-    {
-        // full check
-        LLFolderViewFolder* parent = self;
-        while (parent && !parent->getViewModelItem()->isAgentInventoryRoot())
-        {
-            bool has_favorites = false;
-            for (items_t::iterator iter = parent->mItems.begin();
-                iter != parent->mItems.end();)
-            {
-                items_t::iterator iit = iter++;
-                if ((*iit)->isFavorite())
-                {
-                    has_favorites = true;
-                    break;
-                }
-            }
-
-            for (folders_t::iterator iter = parent->mFolders.begin();
-                iter != parent->mFolders.end() && !has_favorites;)
-            {
-                folders_t::iterator fit = iter++;
-                if ((*fit)->isFavorite() || (*fit)->hasFavorites())
-                {
-                    has_favorites = true;
-                    break;
-                }
-            }
-
-            if (!has_favorites)
-            {
-                if (parent->hasFavorites())
-                {
-                    parent->setHasFavorites(false);
-                }
-                else
-                {
-                    // Nothing changed
-                    break;
-                }
-            }
-            else
-            {
-                // propagate up, exclude root
-                while (parent
-                    && (!parent->hasFavorites() || parent->mFavoritesDirtyFlags)
-                    && !parent->getViewModelItem()->isAgentInventoryRoot())
-                {
-                    parent->setHasFavorites(true);
-                    if (parent->mFavoritesDirtyFlags)
-                    {
-                        // Parent will remove onIdleUpdateFavorites later, don't remove now,
-                        // We are inside gIdleCallbacks. Removing 'self' callback is safe,
-                        // but removing 'parent' can invalidate following iterator
-                        parent->mFavoritesDirtyFlags = 0;
-                    }
-                    parent = parent->getParentFolder();
-                }
-                break;
-            }
-            if (parent->mFavoritesDirtyFlags)
-            {
-                // Parent will remove onIdleUpdateFavorites later, don't remove now.
-                // We are inside gIdleCallbacks. Removing 'self' callback is safe,
-                // but removing 'parent' can invalidate following iterator
-                parent->mFavoritesDirtyFlags = 0;
-            }
-            parent = parent->getParentFolder();
-        }
-    }
-}
-
 
 bool LLFolderViewFolder::isRemovable()
 {
diff --git a/indra/llui/llfolderviewitem.h b/indra/llui/llfolderviewitem.h
index c9b003b892..2ee018a90a 100644
--- a/indra/llui/llfolderviewitem.h
+++ b/indra/llui/llfolderviewitem.h
@@ -50,9 +50,7 @@ class LLFolderViewItem : public LLView
 public:
     struct Params : public LLInitParam::Block<Params, LLView::Params>
     {
-        Optional<LLUIImage*>                        favorite_image,
-                                                    favorite_content_image,
-                                                    folder_arrow_image,
+        Optional<LLUIImage*>                        folder_arrow_image,
                                                     selection_image;
         Mandatory<LLFolderView*>                    root;
         Mandatory<LLFolderViewModelItem*>           listener;
@@ -62,7 +60,7 @@ public:
                                                     item_top_pad;
 
         Optional<time_t>                            creation_date;
-        Optional<bool>                              marketplace_item;
+        Optional<bool>                              allow_wear;
         Optional<bool>                              allow_drop;
 
         Optional<LLUIColor>                         font_color;
@@ -95,8 +93,6 @@ protected:
     LLWString                   mLabel;
     S32                         mLabelWidth;
     bool                        mLabelWidthDirty;
-    bool                        mIsFavorite;
-    bool                        mHasFavorites;
     S32                         mLabelPaddingRight;
     LLFolderViewFolder*         mParentFolder;
     LLPointer<LLFolderViewModelItem> mViewModelItem;
@@ -126,7 +122,7 @@ protected:
                                 mIsCurSelection,
                                 mDragAndDropTarget,
                                 mIsMouseOverTitle,
-                                mMarketplaceItem,
+                                mAllowWear,
                                 mAllowDrop,
                                 mSingleFolderMode,
                                 mDoubleClickOverride,
@@ -137,7 +133,6 @@ protected:
 
     LLUIColor                   mFontColor;
     LLUIColor                   mFontHighlightColor;
-    static bool                 sColorSetInitialized;
 
     // For now assuming all colors are the same in derived classes.
     static LLUIColor            sFgColor;
@@ -150,8 +145,6 @@ protected:
     static LLUIColor            sFilterTextColor;
     static LLUIColor            sSuffixColor;
     static LLUIColor            sSearchStatusColor;
-    static LLUIColor            sFavoriteColor;
-
 
     // this is an internal method used for adding items to folders. A
     // no-op at this level, but reimplemented in derived classes.
@@ -215,8 +208,6 @@ public:
     // Returns true is this object and all of its children can be moved
     virtual bool isMovable();
 
-    bool isFavorite() const { return mIsFavorite; }
-
     // destroys this item recursively
     virtual void destroyView();
 
@@ -307,7 +298,6 @@ public:
     //  virtual void handleDropped();
     virtual void draw();
     void drawOpenFolderArrow();
-    void drawFavoriteIcon();
     void drawHighlight(bool showContent, bool hasKeyboardFocus, const LLUIColor& selectColor, const LLUIColor& flashColor, const LLUIColor& outlineColor, const LLUIColor& mouseOverColor);
     void drawLabel(const LLFontGL* font, const F32 x, const F32 y, const LLColor4& color, F32 &right_x);
     virtual bool handleDragAndDrop(S32 x, S32 y, MASK mask, bool drop,
@@ -321,8 +311,6 @@ private:
     static S32 sTopPad;
     static LLUIImagePtr sFolderArrowImg;
     static LLUIImagePtr sSelectionImg;
-    static LLUIImagePtr sFavoriteImg;
-    static LLUIImagePtr sFavoriteContentImg;
     static LLFontGL* sSuffixFont;
 
     LLFontVertexBuffer mLabelFontBuffer;
@@ -412,18 +400,6 @@ public:
     // Returns true is this object and all of its children can be moved
     virtual bool isMovable();
 
-    bool isFavorite() const { return mIsFavorite; }
-    bool hasFavorites() const { return mHasFavorites; }
-    void setHasFavorites(bool val) { mHasFavorites = val; }
-    void updateHasFavorites(bool new_childs_value);
-private:
-    static void onIdleUpdateFavorites(void* data);
-
-    constexpr static S32 FAVORITE_ADDED = 1;
-    constexpr static S32 FAVORITE_REMOVED = 2;
-    S32 mFavoritesDirtyFlags { 0 };
-public:
-
     // destroys this folder, and all children
     virtual void destroyView();
     void destroyRoot();
diff --git a/indra/llui/llfolderviewmodel.h b/indra/llui/llfolderviewmodel.h
index ba9d0b8de3..9372818ca5 100644
--- a/indra/llui/llfolderviewmodel.h
+++ b/indra/llui/llfolderviewmodel.h
@@ -162,7 +162,6 @@ public:
 
     virtual void navigateToFolder(bool new_window = false, bool change_mode = false) = 0;
 
-    virtual bool isFavorite() const = 0;
     virtual bool isItemWearable() const { return false; }
 
     virtual bool isItemRenameable() const = 0;
@@ -171,8 +170,7 @@ public:
     virtual bool isItemMovable( void ) const = 0;       // Can be moved to another folder
     virtual void move( LLFolderViewModelItem* parent_listener ) = 0;
 
-    virtual bool isItemRemovable( bool check_worn = true) const = 0;     // Can be destroyed
-    virtual bool isItemInTrash(void) const = 0;
+    virtual bool isItemRemovable( bool check_worn = true ) const = 0;       // Can be destroyed
     virtual bool removeItem() = 0;
     virtual void removeBatch(std::vector<LLFolderViewModelItem*>& batch) = 0;
 
@@ -185,9 +183,6 @@ public:
     virtual void pasteFromClipboard() = 0;
     virtual void pasteLinkFromClipboard() = 0;
 
-    virtual bool isAgentInventory() const = 0;
-    virtual bool isAgentInventoryRoot() const = 0;
-
     virtual void buildContextMenu(LLMenuGL& menu, U32 flags) = 0;
 
     virtual bool potentiallyVisible() = 0; // is the item definitely visible or we haven't made up our minds yet?
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index 45dab88e87..b534c8d4e8 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -2230,6 +2230,9 @@ void LLLineEditor::clear()
 {
     mText.clear();
     setCursor(0);
+    mFontBufferPreSelection.reset();
+    mFontBufferSelection.reset();
+    mFontBufferPostSelection.reset();
 }
 
 //virtual
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 2ca2454040..c11b42a348 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -46,7 +46,6 @@
 #include "llfocusmgr.h"
 #include "llcoord.h"
 #include "llwindow.h"
-#include "llemojihelper.h"
 #include "llcriticaldamp.h"
 #include "lluictrlfactory.h"
 
@@ -1412,7 +1411,6 @@ void LLMenuItemBranchDownGL::openMenu( void )
     }
     else
     {
-        LLEmojiHelper::instance().hideHelper(nullptr, true);
         if (branch->getTornOff())
         {
             LLFloater * branch_parent = dynamic_cast<LLFloater *>(branch->getParent());
diff --git a/indra/llui/llmodaldialog.cpp b/indra/llui/llmodaldialog.cpp
index 225ff607ad..c5c31f7252 100644
--- a/indra/llui/llmodaldialog.cpp
+++ b/indra/llui/llmodaldialog.cpp
@@ -28,7 +28,6 @@
 
 #include "llmodaldialog.h"
 
-#include "llemojihelper.h"
 #include "llfocusmgr.h"
 #include "v4color.h"
 #include "v2math.h"
@@ -36,7 +35,6 @@
 #include "llwindow.h"
 #include "llkeyboard.h"
 #include "llmenugl.h"
-
 // static
 std::list<LLModalDialog*> LLModalDialog::sModalStack;
 
@@ -100,7 +98,7 @@ void LLModalDialog::onOpen(const LLSD& key)
 {
     if (mModal)
     {
-        // If Modal, hide the active modal dialog
+        // If Modal, Hide the active modal dialog
         if (!sModalStack.empty())
         {
             LLModalDialog* front = sModalStack.front();
@@ -157,12 +155,6 @@ void LLModalDialog::setVisible( bool visible )
     {
         if( visible )
         {
-            // Hide all menus currently shown
-            LLMenuGL::sMenuContainer->hideMenus();
-
-            // Hide EmojiPicker if it is shown
-            LLEmojiHelper::instance().hideHelper(nullptr, true);
-
             // This is a modal dialog.  It sucks up all mouse and keyboard operations.
             gFocusMgr.setMouseCapture( this );
 
@@ -309,6 +301,7 @@ void LLModalDialog::centerOnScreen()
     centerWithin(LLRect(0, 0, ll_round(window_size.mV[VX]), ll_round(window_size.mV[VY])));
 }
 
+
 // static
 void LLModalDialog::onAppFocusLost()
 {
@@ -340,7 +333,6 @@ void LLModalDialog::onAppFocusGained()
     }
 }
 
-// static
 void LLModalDialog::shutdownModals()
 {
     // This method is only for use during app shutdown. ~LLModalDialog()
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 245339b107..ff77b4d482 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -1007,7 +1007,7 @@ void LLScrollListCtrl::deleteItems(const LLSD& sd)
 void LLScrollListCtrl::deleteSelectedItems()
 {
     item_list::iterator iter;
-    for (iter = mItemList.begin(); iter < mItemList.end(); )
+    for (iter = mItemList.begin(); iter != mItemList.end(); )
     {
         LLScrollListItem* itemp = *iter;
         if (itemp->getSelected())
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 58b785fcdd..cfe729be06 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -274,9 +274,7 @@ LLTextEditor::LLTextEditor(const LLTextEditor::Params& p) :
     mShowChatMentionPicker(false),
     mEnableTooltipPaste(p.enable_tooltip_paste),
     mPassDelete(false),
-    mKeepSelectionOnReturn(false),
-    mSelectAllOnFocusReceived(false),
-    mSelectedOnFocusReceived(false)
+    mKeepSelectionOnReturn(false)
 {
     mSourceID.generate();
 
@@ -400,7 +398,6 @@ void LLTextEditor::selectNext(const std::string& search_text_in, bool case_insen
     setCursorPos(loc);
 
     mIsSelecting = true;
-    mSelectedOnFocusReceived = false;
     mSelectionEnd = mCursorPos;
     mSelectionStart = llmin((S32)getLength(), (S32)(mCursorPos + search_text.size()));
 }
@@ -680,13 +677,6 @@ bool LLTextEditor::canSelectAll() const
     return true;
 }
 
-//virtual
-void LLTextEditor::deselect()
-{
-    LLTextBase::deselect();
-    mSelectedOnFocusReceived = false;
-}
-
 // virtual
 void LLTextEditor::selectAll()
 {
@@ -704,11 +694,6 @@ void LLTextEditor::selectByCursorPosition(S32 prev_cursor_pos, S32 next_cursor_p
     endSelection();
 }
 
-void LLTextEditor::setSelectAllOnFocusReceived(bool b)
-{
-    mSelectAllOnFocusReceived = b;
-}
-
 void LLTextEditor::insertEmoji(llwchar emoji)
 {
     LL_INFOS() << "LLTextEditor::insertEmoji(" << wchar_utf8_preview(emoji) << ")" << LL_ENDL;
@@ -810,16 +795,8 @@ bool LLTextEditor::handleMouseDown(S32 x, S32 y, MASK mask)
     // Delay cursor flashing
     resetCursorBlink();
 
-    mSelectedOnFocusReceived = false;
     if (handled && !gFocusMgr.getMouseCapture())
     {
-        if (!mask && mSelectAllOnFocusReceived)
-        {
-            mIsSelecting = false;
-            mSelectionStart = getLength();
-            mSelectionEnd = 0;
-            mSelectedOnFocusReceived = true;
-        }
         gFocusMgr.setMouseCapture( this );
     }
     return handled;
@@ -2223,11 +2200,6 @@ void LLTextEditor::focusLostHelper()
         gEditMenuHandler = NULL;
     }
 
-    if (mSelectedOnFocusReceived)
-    {
-        deselect();
-    }
-
     if (mCommitOnFocusLost)
     {
         onCommit();
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index cdfcbcdd63..882bb145df 100644
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -144,10 +144,8 @@ public:
     virtual bool    canDoDelete() const;
     virtual void    selectAll();
     virtual bool    canSelectAll()  const;
-    virtual void    deselect();
 
     void            selectByCursorPosition(S32 prev_cursor_pos, S32 next_cursor_pos);
-    void            setSelectAllOnFocusReceived(bool b);
 
     virtual bool    canLoadOrSaveToFile();
 
@@ -338,8 +336,6 @@ private:
     bool            mEnableTooltipPaste;
     bool            mPassDelete;
     bool            mKeepSelectionOnReturn; // disabling of removing selected text after pressing of Enter
-    bool            mSelectAllOnFocusReceived;
-    bool            mSelectedOnFocusReceived;
 
     LLUUID          mSourceID;