Merge main into inventory_favorites

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

1 files changed, 19 insertions, 19 deletions

diff --git a/indra/newview/llthumbnailctrl.h b/indra/newview/llthumbnailctrl.h
index f84a583271..45cc6e541e 100644
--- a/indra/newview/llthumbnailctrl.h
+++ b/indra/newview/llthumbnailctrl.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llthumbnailctrl.h
  * @brief LLThumbnailCtrl base class
  *
  * $LicenseInfo:firstyear=2023&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2023 Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -39,13 +39,13 @@ class LLViewerFetchedTexture;
 // Classes
 //
 
-// 
+//
 class LLThumbnailCtrl
 : public LLUICtrl
 {
 public:
-	struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
-	{
+    struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
+    {
         Optional<LLViewBorder::Params> border;
         Optional<LLUIColor>        border_color;
         Optional<std::string>      image_name;
@@ -53,29 +53,29 @@ public:
         Optional<bool>             border_visible;
         Optional<bool>             interactable;
         Optional<bool>             show_loading;
-        
-		Params();
-	};
+
+        Params();
+    };
 protected:
     LLThumbnailCtrl(const Params&);
-	friend class LLUICtrlFactory;
+    friend class LLUICtrlFactory;
 
 public:
-	virtual ~LLThumbnailCtrl();
+    virtual ~LLThumbnailCtrl();
 
-	virtual void draw() override;
+    virtual void draw() override;
     void setVisible(BOOL visible) override;
 
-	virtual void setValue(const LLSD& value ) override;
+    virtual void setValue(const LLSD& value ) override;
     void setInitImmediately(bool val) { mInitImmediately = val; }
     void clearTexture();
-    
+
     virtual BOOL handleHover(S32 x, S32 y, MASK mask) override;
 
 protected:
     void initImage();
     void unloadImage();
-	
+
 private:
     bool mBorderVisible;
     bool mInteractable;
@@ -86,8 +86,8 @@ private:
     LLUUID mImageAssetID;
     LLViewBorder* mBorder;
     LLUIColor mBorderColor;
-    
-	LLPointer<LLViewerFetchedTexture> mTexturep;
+
+    LLPointer<LLViewerFetchedTexture> mTexturep;
     LLPointer<LLUIImage> mImagep;
     LLPointer<LLUIImage> mFallbackImagep;
 };