Merge commit '9e24b30' into marchcat/maint-c/restore

# Conflicts:
#	indra/llmath/v2math.cpp
#	indra/llmath/v2math.h
#	indra/llmath/v3math.h
#	indra/llmath/v4math.h
#	indra/llui/llfolderviewitem.cpp
#	indra/llui/llfolderviewitem.h
#	indra/llui/llfolderviewmodel.h
#	indra/llui/llmodaldialog.cpp
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltexteditor.h
#	indra/llwindow/llwindowwin32.cpp
#	indra/newview/llagent.cpp
#	indra/newview/llagentcamera.h
#	indra/newview/llavatarrenderinfoaccountant.cpp
#	indra/newview/llconversationmodel.h
#	indra/newview/llfloaterinventorysettings.cpp
#	indra/newview/llfloaternamedesc.cpp
#	indra/newview/llfloaternamedesc.h
#	indra/newview/llfloaterobjectweights.cpp
#	indra/newview/llfloaterobjectweights.h
#	indra/newview/llfolderviewmodelinventory.h
#	indra/newview/llinspecttexture.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventorygallery.h
#	indra/newview/llinventorygallerymenu.cpp
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llinventorypanel.h
#	indra/newview/llmaterialeditor.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitgallery.h
#	indra/newview/lloutfitslist.cpp
#	indra/newview/lloutfitslist.h
#	indra/newview/llpanelgroupcreate.cpp
#	indra/newview/llpanelgroupgeneral.cpp
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpaneloutfitsinventory.h
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llreflectionmap.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/llsidepanelappearance.cpp
#	indra/newview/llsidepaneliteminfo.cpp
#	indra/newview/llteleporthistorystorage.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/lltexturefetch.cpp
#	indra/newview/lltexturefetch.h
#	indra/newview/llviewerassetupload.cpp
#	indra/newview/llviewercamera.cpp
#	indra/newview/llviewercamera.h
#	indra/newview/llviewermenufile.cpp
#	indra/newview/llviewerobject.h
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoavatar.h
#	indra/newview/llvoavatarself.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/llvovolume.h
#	indra/newview/tests/llviewerassetstats_test.cpp

10 files changed, 299 insertions, 16 deletions

diff --git a/indra/llui/llaccordionctrltab.h b/indra/llui/llaccordionctrltab.h
index cf3569683e..987233f090 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);
 
-    void draw();
+    virtual void draw();
 
     void storeOpenCloseState();
     void restoreOpenCloseState();
diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp
index 53f39766c6..25d4435ae6 100644
--- a/indra/llui/llflatlistview.cpp
+++ b/indra/llui/llflatlistview.cpp
@@ -1342,9 +1342,17 @@ bool LLFlatListViewEx::getForceShowingUnmatchedItems()
     return mForceShowingUnmatchedItems;
 }
 
-void LLFlatListViewEx::setForceShowingUnmatchedItems(bool show)
+void LLFlatListViewEx::setForceShowingUnmatchedItems(bool show, bool notify_parent)
+{
+    if (mForceShowingUnmatchedItems != show)
 {
     mForceShowingUnmatchedItems = show;
+        if (!mFilterSubString.empty())
+        {
+            updateNoItemsMessage(mFilterSubString);
+            filterItems(false, true);
+        }
+    }
 }
 
 void LLFlatListViewEx::setFilterSubString(const std::string& filter_str, bool notify_parent)
@@ -1412,6 +1420,7 @@ 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 6d75e9f282..3a50201a43 100644
--- a/indra/llui/llflatlistview.h
+++ b/indra/llui/llflatlistview.h
@@ -480,7 +480,11 @@ public:
 
     bool getForceShowingUnmatchedItems();
 
-    void setForceShowingUnmatchedItems(bool show);
+    /**
+     * 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);
 
     /**
      * Sets up new filter string and filters the list.
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 18bde344a0..c58180a147 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -31,11 +31,12 @@
 #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,6 +62,8 @@ S32 LLFolderViewItem::sTopPad = 0;
 LLUIImagePtr LLFolderViewItem::sFolderArrowImg;
 LLUIImagePtr LLFolderViewItem::sSelectionImg;
 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;
@@ -129,13 +132,15 @@ 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(),
-    allow_wear("allow_wear", true),
+    marketplace_item("marketplace_item", false),
     allow_drop("allow_drop", true),
     font_color("font_color"),
     font_highlight_color("font_highlight_color"),
@@ -155,6 +160,8 @@ 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 ),
@@ -175,7 +182,7 @@ LLFolderViewItem::LLFolderViewItem(const LLFolderViewItem::Params& p)
     mRoot(p.root),
     mViewModelItem(p.listener),
     mIsMouseOverTitle(false),
-    mAllowWear(p.allow_wear),
+    mMarketplaceItem(p.marketplace_item),
     mAllowDrop(p.allow_drop),
     mFontColor(p.font_color),
     mFontHighlightColor(p.font_highlight_color),
@@ -189,6 +196,21 @@ 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);
@@ -211,6 +233,7 @@ 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)
@@ -325,6 +348,7 @@ 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()
@@ -359,6 +383,8 @@ void LLFolderViewItem::refreshSuffix()
     mIconOpen = vmi->getIconOpen();
     mIconOverlay = vmi->getIconOverlay();
 
+    mIsFavorite = vmi->isFavorite() && !vmi->isItemInTrash();
+
     if (mRoot->useLabelSuffix())
     {
         // Very Expensive!
@@ -554,10 +580,15 @@ void LLFolderViewItem::buildContextMenu(LLMenuGL& menu, U32 flags)
 
 void LLFolderViewItem::openItem( void )
 {
-    if (mAllowWear || !getViewModelItem()->isItemWearable())
+    if (!mMarketplaceItem || !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)
@@ -771,6 +802,32 @@ void LLFolderViewItem::drawOpenFolderArrow()
     }
 }
 
+void LLFolderViewItem::drawFavoriteIcon(const Params& default_params, const LLUIColor& fg_color)
+{
+    static LLUICachedControl<bool> draw_star("InventoryFavoritesUseStar", true);
+    static LLUICachedControl<bool> draw_hollow_star("InventoryFavoritesUseHollowStar", true);
+
+    LLUIImage* favorite_image = NULL;
+    if (draw_star && mIsFavorite)
+    {
+        favorite_image = default_params.favorite_image;
+    }
+    else if (draw_hollow_star && mHasFavorites && !isOpen())
+    {
+        favorite_image = default_params.favorite_content_image;
+    }
+
+    if (favorite_image)
+    {
+        const S32 PAD = 3;
+        const S32 image_size = 14;
+
+        gl_draw_scaled_image(
+            getRect().getWidth() - image_size - PAD, getRect().getHeight() - mItemHeight + PAD,
+            image_size, image_size, favorite_image->getImage(), fg_color);
+    }
+}
+
 /*virtual*/ bool LLFolderViewItem::isHighlightAllowed()
 {
     return mIsSelected;
@@ -929,6 +986,9 @@ void LLFolderViewItem::draw()
         drawOpenFolderArrow();
     }
 
+    const Params& default_params = LLUICtrlFactory::getDefaultParams<LLFolderViewItem>();
+    drawFavoriteIcon(default_params, sFgColor);
+
     drawHighlight(show_context, filled, sHighlightBgColor, sFlashBgColor, sFocusOutlineColor, sMouseOverColor);
 
     //--------------------------------------------------------------------------------//
@@ -999,7 +1059,20 @@ void LLFolderViewItem::draw()
         }
     }
 
-    LLColor4 color = (mIsSelected && filled) ? mFontHighlightColor : mFontColor;
+    static LLUICachedControl<bool> highlight_color("InventoryFavoritesColorText", true);
+    LLColor4 color;
+    if (mIsSelected && filled)
+    {
+        color = mFontHighlightColor;
+    }
+    else if (mIsFavorite && highlight_color)
+    {
+        color = sFavoriteColor;
+    }
+    else
+    {
+        color = mFontColor;
+    }
 
     if (isFadeItem())
     {
@@ -1093,7 +1166,8 @@ 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)
+    mLastCalculatedWidth(0),
+    mFavoritesDirtyFlags(0)
 {
 }
 
@@ -1119,6 +1193,11 @@ 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
@@ -1762,6 +1841,128 @@ 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)
+    {
+        LL_WARNS() << "Called onIdleUpdateFavorites without dirty flags set" << LL_ENDL;
+        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)
+                {
+                    gIdleCallbacks.deleteFunction(&LLFolderViewFolder::onIdleUpdateFavorites, parent);
+                    parent->mFavoritesDirtyFlags = 0;
+                }
+                parent = parent->getParentFolder();
+            }
+        }
+    }
+    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)
+                    {
+                        gIdleCallbacks.deleteFunction(&LLFolderViewFolder::onIdleUpdateFavorites, parent);
+                        parent->mFavoritesDirtyFlags = 0;
+                    }
+                    parent = parent->getParentFolder();
+                }
+                break;
+            }
+            if (parent->mFavoritesDirtyFlags)
+            {
+                parent->mFavoritesDirtyFlags = 0;
+                gIdleCallbacks.deleteFunction(&LLFolderViewFolder::onIdleUpdateFavorites, parent);
+            }
+            parent = parent->getParentFolder();
+        }
+    }
+}
+
 
 bool LLFolderViewFolder::isRemovable()
 {
diff --git a/indra/llui/llfolderviewitem.h b/indra/llui/llfolderviewitem.h
index cc8a7d934c..024115a96f 100644
--- a/indra/llui/llfolderviewitem.h
+++ b/indra/llui/llfolderviewitem.h
@@ -50,7 +50,9 @@ class LLFolderViewItem : public LLView
 public:
     struct Params : public LLInitParam::Block<Params, LLView::Params>
     {
-        Optional<LLUIImage*>                        folder_arrow_image,
+        Optional<LLUIImage*>                        favorite_image,
+                                                    favorite_content_image,
+                                                    folder_arrow_image,
                                                     selection_image;
         Mandatory<LLFolderView*>                    root;
         Mandatory<LLFolderViewModelItem*>           listener;
@@ -60,7 +62,7 @@ public:
                                                     item_top_pad;
 
         Optional<time_t>                            creation_date;
-        Optional<bool>                              allow_wear;
+        Optional<bool>                              marketplace_item;
         Optional<bool>                              allow_drop;
 
         Optional<LLUIColor>                         font_color;
@@ -93,6 +95,8 @@ protected:
     LLWString                   mLabel;
     S32                         mLabelWidth;
     bool                        mLabelWidthDirty;
+    bool                        mIsFavorite;
+    bool                        mHasFavorites;
     S32                         mLabelPaddingRight;
     LLFolderViewFolder*         mParentFolder;
     LLPointer<LLFolderViewModelItem> mViewModelItem;
@@ -122,7 +126,7 @@ protected:
                                 mIsCurSelection,
                                 mDragAndDropTarget,
                                 mIsMouseOverTitle,
-                                mAllowWear,
+                                mMarketplaceItem,
                                 mAllowDrop,
                                 mSingleFolderMode,
                                 mDoubleClickOverride,
@@ -133,6 +137,7 @@ protected:
 
     LLUIColor                   mFontColor;
     LLUIColor                   mFontHighlightColor;
+    static bool                 sColorSetInitialized;
 
     // For now assuming all colors are the same in derived classes.
     static LLUIColor            sFgColor;
@@ -145,6 +150,8 @@ 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.
@@ -208,6 +215,8 @@ 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();
 
@@ -298,6 +307,7 @@ public:
     //  virtual void handleDropped();
     virtual void draw();
     void drawOpenFolderArrow();
+    void drawFavoriteIcon(const Params& default_params, const LLUIColor& fg_color);
     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,
@@ -400,6 +410,18 @@ 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 9372818ca5..ba9d0b8de3 100644
--- a/indra/llui/llfolderviewmodel.h
+++ b/indra/llui/llfolderviewmodel.h
@@ -162,6 +162,7 @@ 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;
@@ -170,7 +171,8 @@ 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 isItemRemovable( bool check_worn = true) const = 0;     // Can be destroyed
+    virtual bool isItemInTrash(void) const = 0;
     virtual bool removeItem() = 0;
     virtual void removeBatch(std::vector<LLFolderViewModelItem*>& batch) = 0;
 
@@ -183,6 +185,9 @@ 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/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 69ffa9a94f..1ffa20a188 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -46,6 +46,7 @@
 #include "llfocusmgr.h"
 #include "llcoord.h"
 #include "llwindow.h"
+#include "llemojihelper.h"
 #include "llcriticaldamp.h"
 #include "lluictrlfactory.h"
 
@@ -1411,6 +1412,7 @@ 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 c5c31f7252..225ff607ad 100644
--- a/indra/llui/llmodaldialog.cpp
+++ b/indra/llui/llmodaldialog.cpp
@@ -28,6 +28,7 @@
 
 #include "llmodaldialog.h"
 
+#include "llemojihelper.h"
 #include "llfocusmgr.h"
 #include "v4color.h"
 #include "v2math.h"
@@ -35,6 +36,7 @@
 #include "llwindow.h"
 #include "llkeyboard.h"
 #include "llmenugl.h"
+
 // static
 std::list<LLModalDialog*> LLModalDialog::sModalStack;
 
@@ -98,7 +100,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();
@@ -155,6 +157,12 @@ 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 );
 
@@ -301,7 +309,6 @@ void LLModalDialog::centerOnScreen()
     centerWithin(LLRect(0, 0, ll_round(window_size.mV[VX]), ll_round(window_size.mV[VY])));
 }
 
-
 // static
 void LLModalDialog::onAppFocusLost()
 {
@@ -333,6 +340,7 @@ void LLModalDialog::onAppFocusGained()
     }
 }
 
+// static
 void LLModalDialog::shutdownModals()
 {
     // This method is only for use during app shutdown. ~LLModalDialog()
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 3537c764b9..d1ad2a9c50 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -265,7 +265,9 @@ LLTextEditor::LLTextEditor(const LLTextEditor::Params& p) :
     mShowEmojiHelper(p.show_emoji_helper),
     mEnableTooltipPaste(p.enable_tooltip_paste),
     mPassDelete(false),
-    mKeepSelectionOnReturn(false)
+    mKeepSelectionOnReturn(false),
+    mSelectAllOnFocusReceived(false),
+    mSelectedOnFocusReceived(false)
 {
     mSourceID.generate();
 
@@ -389,6 +391,7 @@ 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()));
 }
@@ -668,6 +671,13 @@ bool LLTextEditor::canSelectAll() const
     return true;
 }
 
+//virtual
+void LLTextEditor::deselect()
+{
+    LLTextBase::deselect();
+    mSelectedOnFocusReceived = false;
+}
+
 // virtual
 void LLTextEditor::selectAll()
 {
@@ -685,6 +695,11 @@ 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;
@@ -762,8 +777,16 @@ 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;
@@ -2127,6 +2150,11 @@ void LLTextEditor::focusLostHelper()
         gEditMenuHandler = NULL;
     }
 
+    if (mSelectedOnFocusReceived)
+    {
+        deselect();
+    }
+
     if (mCommitOnFocusLost)
     {
         onCommit();
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index e9e7070414..5eb7b76259 100644
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -142,8 +142,10 @@ 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();
 
@@ -333,6 +335,8 @@ private:
     bool            mEnableTooltipPaste;
     bool            mPassDelete;
     bool            mKeepSelectionOnReturn; // disabling of removing selected text after pressing of Enter
+    bool            mSelectAllOnFocusReceived;
+    bool            mSelectedOnFocusReceived;
 
     LLUUID          mSourceID;