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, 10 insertions, 10 deletions

diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h
index 4e0350b4cc..dda65476af 100644
--- a/indra/newview/llmaterialeditor.h
+++ b/indra/newview/llmaterialeditor.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llmaterialeditor.h
  * @brief LLMaterialEditor class header file
  *
  * $LicenseInfo:firstyear=2022&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, 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$
  */
@@ -55,7 +55,7 @@ public:
     LLFloaterComboOptions();
 
     virtual ~LLFloaterComboOptions();
-    /*virtual*/	BOOL	postBuild();
+    /*virtual*/ BOOL    postBuild();
 
     static LLFloaterComboOptions* showUI(
         combo_callback callback,
@@ -86,7 +86,7 @@ protected:
 
 class LLMaterialEditor : public LLPreview, public LLVOInventoryListener
 { public:
-	LLMaterialEditor(const LLSD& key);
+    LLMaterialEditor(const LLSD& key);
     ~LLMaterialEditor();
 
     bool setFromGltfModel(const tinygltf::Model& model, S32 index, bool set_textures = false);
@@ -163,8 +163,8 @@ class LLMaterialEditor : public LLPreview, public LLVOInventoryListener
     void setObjectID(const LLUUID& object_id) override;
     void setAuxItem(const LLInventoryItem* item) override;
 
-	// llpanel
-	BOOL postBuild() override;
+    // llpanel
+    BOOL postBuild() override;
     void onClickCloseBtn(bool app_quitting = false) override;
 
     void onClose(bool app_quitting) override;
@@ -188,7 +188,7 @@ class LLMaterialEditor : public LLPreview, public LLVOInventoryListener
 
     F32 getAlphaCutoff();
     void setAlphaCutoff(F32 alpha_cutoff);
-    
+
     void setMaterialName(const std::string &name);
 
     LLUUID getMetallicRoughnessId();