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

diff --git a/indra/newview/llviewerjointmesh.h b/indra/newview/llviewerjointmesh.h
index 0db2836e15..deeec727a9 100644
--- a/indra/newview/llviewerjointmesh.h
+++ b/indra/newview/llviewerjointmesh.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llviewerjointmesh.h
  * @brief Declaration of LLViewerJointMesh class
  *
  * $LicenseInfo:firstyear=2001&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$
  */
@@ -44,34 +44,34 @@ class LLViewerTexLayerSet;
 class LLViewerJointMesh : public LLAvatarJointMesh, public LLViewerJoint
 {
 public:
-	// Constructor
-	LLViewerJointMesh();
+    // Constructor
+    LLViewerJointMesh();
+
+    // Destructor
+    virtual ~LLViewerJointMesh();
 
-	// Destructor
-	virtual ~LLViewerJointMesh();
+    // Render time method to upload batches of joint matrices
+    void uploadJointMatrices();
 
-	// Render time method to upload batches of joint matrices
-	void uploadJointMatrices();
+    // overloaded from base class
+    /*virtual*/ U32 drawShape( F32 pixelArea, BOOL first_pass, BOOL is_dummy );
 
-	// overloaded from base class
-	/*virtual*/ U32 drawShape( F32 pixelArea, BOOL first_pass, BOOL is_dummy );
+    // necessary because MS's compiler warns on function inheritance via dominance in the diamond inheritance here.
+    // warns even though LLViewerJoint holds the only non virtual implementation.
+    /*virtual*/ U32 render( F32 pixelArea, BOOL first_pass = TRUE, BOOL is_dummy = FALSE ) { return LLViewerJoint::render(pixelArea,first_pass,is_dummy);}
 
-	// necessary because MS's compiler warns on function inheritance via dominance in the diamond inheritance here.
-	// warns even though LLViewerJoint holds the only non virtual implementation.
-	/*virtual*/ U32 render( F32 pixelArea, BOOL first_pass = TRUE, BOOL is_dummy = FALSE ) { return LLViewerJoint::render(pixelArea,first_pass,is_dummy);}
+    /*virtual*/ void updateFaceSizes(U32 &num_vertices, U32& num_indices, F32 pixel_area);
+    /*virtual*/ void updateFaceData(LLFace *face, F32 pixel_area, BOOL damp_wind = FALSE, bool terse_update = false);
+    /*virtual*/ BOOL updateLOD(F32 pixel_area, BOOL activate);
+    /*virtual*/ void updateJointGeometry();
+    /*virtual*/ void dump();
 
-	/*virtual*/ void updateFaceSizes(U32 &num_vertices, U32& num_indices, F32 pixel_area);
-	/*virtual*/ void updateFaceData(LLFace *face, F32 pixel_area, BOOL damp_wind = FALSE, bool terse_update = false);
-	/*virtual*/ BOOL updateLOD(F32 pixel_area, BOOL activate);
-	/*virtual*/ void updateJointGeometry();
-	/*virtual*/ void dump();
+    /*virtual*/ BOOL isAnimatable() const { return FALSE; }
 
-	/*virtual*/ BOOL isAnimatable() const { return FALSE; }
-	
 private:
 
-	//copy mesh into given face's vertex buffer, applying current animation pose
-	static void updateGeometry(LLFace* face, LLPolyMesh* mesh);
+    //copy mesh into given face's vertex buffer, applying current animation pose
+    static void updateGeometry(LLFace* face, LLPolyMesh* mesh);
 };
 
 #endif // LL_LLVIEWERJOINTMESH_H