Merge main into inventory_favorites

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

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/newview/llpaneleditwater.h b/indra/newview/llpaneleditwater.h
index 4b7ec903c9..f35a5ce2c2 100644
--- a/indra/newview/llpaneleditwater.h
+++ b/indra/newview/llpaneleditwater.h
@@ -55,8 +55,8 @@ protected:
     LLSettingsWater::ptr_t  mWaterSettings;
 };
 
-// *RIDER* In this case this split is unecessary since there is only a single 
-// tab page for water settings at this point.  However more may be added in the 
+// *RIDER* In this case this split is unecessary since there is only a single
+// tab page for water settings at this point.  However more may be added in the
 // future and I want to reinforce the pattern used for sky/atmosphere tabs.
 class LLPanelSettingsWaterMainTab : public LLPanelSettingsWater
 {
@@ -65,8 +65,8 @@ class LLPanelSettingsWaterMainTab : public LLPanelSettingsWater
 public:
                             LLPanelSettingsWaterMainTab();
 
-    virtual BOOL	        postBuild() override;
-    virtual void	        setEnabled(BOOL enabled) override;
+    virtual BOOL            postBuild() override;
+    virtual void            setEnabled(BOOL enabled) override;
 
 protected:
     virtual void            refresh() override;