Merge main into inventory_favorites

# Conflicts:
#	indra/llui/llfolderviewmodel.h
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llwearableitemslist.cpp

1 files changed, 6 insertions, 6 deletions

diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 4ef9991884..f8b70c7930 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -152,11 +152,11 @@ public:
     LLInventoryGalleryItem* getFirstSelectedItem();
 
     // Copy & paste (LLEditMenuHandler)
-    void	copy() override;
-    BOOL	canCopy() const override;
+    void    copy() override;
+    BOOL    canCopy() const override;
 
-    void	cut() override;
-    BOOL	canCut() const override;
+    void    cut() override;
+    BOOL    canCut() const override;
 
     void paste() override;
     BOOL canPaste() const override;
@@ -336,7 +336,7 @@ public:
     std::string getItemName() {return mItemName;}
     std::string getItemNameSuffix() {return mPermSuffix + mWornSuffix;}
     bool isDefaultImage() {return mDefaultImage;}
-    
+
     bool isHidden() {return mHidden;}
     void setHidden(bool hidden) {mHidden = hidden;}
 
@@ -351,7 +351,7 @@ public:
     EInventorySortGroup getSortGroup() { return mSortGroup; }
 
     void updateNameText();
-    
+
 private:
     bool isFadeItem();