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/llfloatersettingsdebug.h b/indra/newview/llfloatersettingsdebug.h
index 888eaadcbd..5a392e766c 100644
--- a/indra/newview/llfloatersettingsdebug.h
+++ b/indra/newview/llfloatersettingsdebug.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llfloatersettingsdebug.h
  * @brief floater for debugging internal viewer settings
  *
  * $LicenseInfo:firstyear=2022&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2022, 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$
  */
@@ -32,29 +32,29 @@
 
 class LLScrollListCtrl;
 
-class LLFloaterSettingsDebug 
-:	public LLFloater
+class LLFloaterSettingsDebug
+:   public LLFloater
 {
-	friend class LLFloaterReg;
+    friend class LLFloaterReg;
 
 public:
 
-	virtual BOOL postBuild();
-	virtual void draw();
+    virtual BOOL postBuild();
+    virtual void draw();
 
-	void updateControl(LLControlVariable* control);
+    void updateControl(LLControlVariable* control);
 
-	void onCommitSettings();
-	void onClickDefault();
+    void onCommitSettings();
+    void onClickDefault();
 
     bool matchesSearchFilter(std::string setting_name);
     bool isSettingHidden(LLControlVariable* control);
 
 private:
-	// key - selects which settings to show, one of:
-	// "all", "base", "account", "skin"
-	LLFloaterSettingsDebug(const LLSD& key);
-	virtual ~LLFloaterSettingsDebug();
+    // key - selects which settings to show, one of:
+    // "all", "base", "account", "skin"
+    LLFloaterSettingsDebug(const LLSD& key);
+    virtual ~LLFloaterSettingsDebug();
 
     void updateList(bool skip_selection = false);
     void onSettingSelect();
@@ -64,9 +64,9 @@ private:
     void hideUIControls();
 
     LLScrollListCtrl* mSettingList;
-	
+
 protected:
-	class LLTextEditor* mComment;
+    class LLTextEditor* mComment;
 
     std::string mSearchFilter;
 };