Merge main into inventory_favorites

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

1 files changed, 10 insertions, 10 deletions

diff --git a/indra/llrender/llcubemaparray.cpp b/indra/llrender/llcubemaparray.cpp
index 1debd33953..03fbb90bf6 100644
--- a/indra/llrender/llcubemaparray.cpp
+++ b/indra/llrender/llcubemaparray.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llcubemaparray.cpp
  * @brief LLCubeMap class implementation
  *
  * $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$
  */
@@ -63,7 +63,7 @@ LLVector3 LLCubeMapArray::sLookVecs[6] =
         LLVector3(0, 0, -1)
 };
 
-LLVector3 LLCubeMapArray::sUpVecs[6] = 
+LLVector3 LLCubeMapArray::sUpVecs[6] =
 {
     LLVector3(0, -1, 0),
     LLVector3(0, -1, 0),
@@ -77,7 +77,7 @@ LLVector3 LLCubeMapArray::sClipToCubeLookVecs[6] =
 {
         LLVector3(0, 0, -1), //GOOD
         LLVector3(0, 0, 1), //GOOD
-        
+
         LLVector3(1, 0, 0), // GOOD
         LLVector3(1, 0, 0), // GOOD
 
@@ -98,9 +98,9 @@ LLVector3 LLCubeMapArray::sClipToCubeUpVecs[6] =
 };
 
 LLCubeMapArray::LLCubeMapArray()
-	: mTextureStage(0)
+    : mTextureStage(0)
 {
-	
+
 }
 
 LLCubeMapArray::~LLCubeMapArray()
@@ -170,7 +170,7 @@ void LLCubeMapArray::unbind()
 
 GLuint LLCubeMapArray::getGLName()
 {
-	return mImage->getTexName();
+    return mImage->getTexName();
 }
 
 void LLCubeMapArray::destroyGL()