Merge branch 'main' into marchcat/x-b-merge

# Conflicts:
#	autobuild.xml
#	indra/cmake/ConfigurePkgConfig.cmake
#	indra/cmake/ICU4C.cmake
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
#	indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
#	indra/newview/llappviewerlinux_api.h
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llappviewerlinux_api_dbus.h
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/lloutfitslist.cpp

1 files changed, 16 insertions, 16 deletions

diff --git a/indra/llrender/llcubemaparray.h b/indra/llrender/llcubemaparray.h
index 6c3f7dc890..9d78c5b0d4 100644
--- a/indra/llrender/llcubemaparray.h
+++ b/indra/llrender/llcubemaparray.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llcubemaparray.h
  * @brief LLCubeMap class definition
  *
  * $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$
  */
@@ -35,10 +35,10 @@ class LLVector3;
 class LLCubeMapArray : public LLRefCount
 {
 public:
-	LLCubeMapArray();
+    LLCubeMapArray();
 
     static GLenum sTargets[6];
-    
+
     // look and up vectors for each cube face (agent space)
     static LLVector3 sLookVecs[6];
     static LLVector3 sUpVecs[6];
@@ -47,18 +47,18 @@ public:
     static LLVector3 sClipToCubeLookVecs[6];
     static LLVector3 sClipToCubeUpVecs[6];
 
-    // allocate a cube map array 
+    // allocate a cube map array
     // res - resolution of each cube face
     // components - number of components per pixel
     // count - number of cube maps in the array
     // use_mips - if TRUE, mipmaps will be allocated for this cube map array and anisotropic filtering will be used
     void allocate(U32 res, U32 components, U32 count, BOOL use_mips = TRUE);
-	void bind(S32 stage);
+    void bind(S32 stage);
     void unbind();
-	
-	GLuint getGLName();
 
-	void destroyGL();
+    GLuint getGLName();
+
+    void destroyGL();
 
     // get width of cubemaps in array (they're cubes, so this is also the height)
     U32 getWidth() const { return mWidth; }
@@ -67,10 +67,10 @@ public:
     U32 getCount() const { return mCount; }
 
 protected:
-	friend class LLTexUnit;
-	~LLCubeMapArray();
-	LLPointer<LLImageGL> mImage;
+    friend class LLTexUnit;
+    ~LLCubeMapArray();
+    LLPointer<LLImageGL> mImage;
     U32 mWidth = 0;
     U32 mCount = 0;
-	S32 mTextureStage;
+    S32 mTextureStage;
 };