Merge main into inventory_favorites

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

1 files changed, 8 insertions, 8 deletions

diff --git a/indra/newview/tests/lldir_stub.cpp b/indra/newview/tests/lldir_stub.cpp
index 911e9334dd..5d9c2f718b 100644
--- a/indra/newview/tests/lldir_stub.cpp
+++ b/indra/newview/tests/lldir_stub.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file lldir_stub.cpp
  * @brief  stub class to allow unit testing
  *
  * $LicenseInfo:firstyear=2009&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2011, 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$
  */
@@ -46,9 +46,9 @@ public:
     LLDir_stub() = default;
     ~LLDir_stub() = default;
 
-	void initAppDirs(const std::string &app_name, const std::string &) override {}
+    void initAppDirs(const std::string &app_name, const std::string &) override {}
 
-	std::string getCurPath() override { return "CUR_PATH_FROM_LLDIR"; }
+    std::string getCurPath() override { return "CUR_PATH_FROM_LLDIR"; }
     bool fileExists(const std::string &filename) const override { return false; }
 
     std::string getLLPluginLauncher()  override { return ""; }
@@ -61,7 +61,7 @@ LLDir* gDirUtilp = &gDirUtil;
 
 std::string LLDir::getExpandedFilename(ELLPath loc, const std::string& subdir, const std::string& filename) const
 {
-	return subdir + " --- " + filename + " --- expanded!";
+    return subdir + " --- " + filename + " --- expanded!";
 }
 
 std::string LLDir::getExpandedFilename(ELLPath location, const std::string &filename) const