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

diff --git a/indra/newview/lldrawpoolmaterials.h b/indra/newview/lldrawpoolmaterials.h
index c46c053bd0..345697ffd1 100644
--- a/indra/newview/lldrawpoolmaterials.h
+++ b/indra/newview/lldrawpoolmaterials.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file lldrawpoolmaterials.h
  * @brief LLDrawPoolMaterials class definition
  * @author Jonathan "Geenz" Goodman
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2002&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2013, 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$
  */
@@ -40,31 +40,31 @@ class LLGLSLShader;
 
 class LLDrawPoolMaterials : public LLRenderPass
 {
-	LLGLSLShader *mShader;
+    LLGLSLShader *mShader;
 public:
-	LLDrawPoolMaterials();
-	
-	enum
-	{
-		VERTEX_DATA_MASK =	LLVertexBuffer::MAP_VERTEX |
-		LLVertexBuffer::MAP_NORMAL |
-		LLVertexBuffer::MAP_TEXCOORD0 |
-		LLVertexBuffer::MAP_TEXCOORD1 |
-		LLVertexBuffer::MAP_TEXCOORD2 |
-		LLVertexBuffer::MAP_COLOR |
-		LLVertexBuffer::MAP_TANGENT
-	};
-	
-	U32 getVertexDataMask() override { return VERTEX_DATA_MASK; }
-	
-	void render(S32 pass = 0) override { }
-	S32	 getNumPasses() override {return 0;}
-	void prerender() override;
-	
-	S32 getNumDeferredPasses() override;
-	void beginDeferredPass(S32 pass) override;
-	void endDeferredPass(S32 pass) override;
-	void renderDeferred(S32 pass) override;
+    LLDrawPoolMaterials();
+
+    enum
+    {
+        VERTEX_DATA_MASK =  LLVertexBuffer::MAP_VERTEX |
+        LLVertexBuffer::MAP_NORMAL |
+        LLVertexBuffer::MAP_TEXCOORD0 |
+        LLVertexBuffer::MAP_TEXCOORD1 |
+        LLVertexBuffer::MAP_TEXCOORD2 |
+        LLVertexBuffer::MAP_COLOR |
+        LLVertexBuffer::MAP_TANGENT
+    };
+
+    U32 getVertexDataMask() override { return VERTEX_DATA_MASK; }
+
+    void render(S32 pass = 0) override { }
+    S32  getNumPasses() override {return 0;}
+    void prerender() override;
+
+    S32 getNumDeferredPasses() override;
+    void beginDeferredPass(S32 pass) override;
+    void endDeferredPass(S32 pass) override;
+    void renderDeferred(S32 pass) override;
 };
 
 #endif //LL_LLDRAWPOOLMATERIALS_H