Merge main into inventory_favorites

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

1 files changed, 13 insertions, 13 deletions

diff --git a/indra/newview/llfloaterpreferenceviewadvanced.h b/indra/newview/llfloaterpreferenceviewadvanced.h
index 4619fdaab1..06305fedab 100644
--- a/indra/newview/llfloaterpreferenceviewadvanced.h
+++ b/indra/newview/llfloaterpreferenceviewadvanced.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llfloaterpreferenceviewadvanced.h
  * @brief floater for adjusting camera position
  *
  * $LicenseInfo:firstyear=2018&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2018, 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$
  */
@@ -31,20 +31,20 @@
 #include "llfloater.h"
 
 class LLFloaterPreferenceViewAdvanced
-:	public LLFloater
+:   public LLFloater
 {
-	friend class LLFloaterReg;
+    friend class LLFloaterReg;
 
 public:
-	LLFloaterPreferenceViewAdvanced(const LLSD& key);
-	virtual void draw();
+    LLFloaterPreferenceViewAdvanced(const LLSD& key);
+    virtual void draw();
 
-	void onCommitSettings();
-	void updateCameraControl(const LLVector3& vector);
-	void updateFocusControl(const LLVector3d& vector3d);
+    void onCommitSettings();
+    void updateCameraControl(const LLVector3& vector);
+    void updateFocusControl(const LLVector3d& vector3d);
 
 private:
-	virtual ~LLFloaterPreferenceViewAdvanced();
+    virtual ~LLFloaterPreferenceViewAdvanced();
 };
 
 #endif //LLFLOATERPREFERENCEVIEWADVANCED_H