Merge main into inventory_favorites

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

1 files changed, 9 insertions, 9 deletions

diff --git a/indra/newview/llfloaterbigpreview.h b/indra/newview/llfloaterbigpreview.h
index 513ed8da6e..62e878233b 100644
--- a/indra/newview/llfloaterbigpreview.h
+++ b/indra/newview/llfloaterbigpreview.h
@@ -1,4 +1,4 @@
-/** 
+/**
 * @file   llfloaterbigpreview.h
 * @brief  Display of extended (big) preview for snapshots
 * @author merov@lindenlab.com
@@ -32,21 +32,21 @@
 class LLFloaterBigPreview : public LLFloater
 {
 public:
-	LLFloaterBigPreview(const LLSD& key);
+    LLFloaterBigPreview(const LLSD& key);
     ~LLFloaterBigPreview();
-    
-	BOOL postBuild();
-	void draw();
-	void onCancel();
+
+    BOOL postBuild();
+    void draw();
+    void onCancel();
 
     void setPreview(LLView* previewp) { mPreviewHandle = previewp->getHandle(); }
     void setFloaterOwner(LLFloater* floaterp) { mFloaterOwner = floaterp; }
     bool isFloaterOwner(LLFloater* floaterp) const { return (mFloaterOwner == floaterp); }
     void closeOnFloaterOwnerClosing(LLFloater* floaterp);
-	
+
 private:
-	LLHandle<LLView> mPreviewHandle;
-	LLUICtrl*  mPreviewPlaceholder;
+    LLHandle<LLView> mPreviewHandle;
+    LLUICtrl*  mPreviewPlaceholder;
     LLFloater* mFloaterOwner;
 };