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/llinspecttexture.h b/indra/newview/llinspecttexture.h
index ff0d80b825..d735789bf1 100644
--- a/indra/newview/llinspecttexture.h
+++ b/indra/newview/llinspecttexture.h
@@ -31,19 +31,19 @@ class LLTexturePreviewView;
 
 namespace LLInspectTextureUtil
 {
-	LLToolTip* createInventoryToolTip(LLToolTip::Params p);
+    LLToolTip* createInventoryToolTip(LLToolTip::Params p);
 }
 
 class LLTextureToolTip : public LLToolTip
 {
 public:
-	LLTextureToolTip(const LLToolTip::Params& p);
-	~LLTextureToolTip();
+    LLTextureToolTip(const LLToolTip::Params& p);
+    ~LLTextureToolTip();
 
 public:
-	void initFromParams(const LLToolTip::Params& p) override;
+    void initFromParams(const LLToolTip::Params& p) override;
 
 protected:
-	LLTexturePreviewView* mPreviewView;
-	S32                   mPreviewSize;
+    LLTexturePreviewView* mPreviewView;
+    S32                   mPreviewSize;
 };