Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A

# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp

1 files changed, 172 insertions, 172 deletions

diff --git a/indra/newview/llviewerjoint.cpp b/indra/newview/llviewerjoint.cpp
index 08b47d9df3..f64f717975 100644
--- a/indra/newview/llviewerjoint.cpp
+++ b/indra/newview/llviewerjoint.cpp
@@ -1,172 +1,172 @@
-/** 
- * @file llviewerjoint.cpp
- * @brief Implementation of LLViewerJoint 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$
- */
-
-//-----------------------------------------------------------------------------
-// Header Files
-//-----------------------------------------------------------------------------
-#include "llviewerprecompiledheaders.h"
-
-#include "llviewerjoint.h"
-
-#include "llgl.h"
-#include "llrender.h"
-#include "llmath.h"
-#include "llglheaders.h"
-#include "llvoavatar.h"
-#include "pipeline.h"
-
-static constexpr S32 MIN_PIXEL_AREA_3PASS_HAIR = 64*64;
-
-//-----------------------------------------------------------------------------
-// LLViewerJoint()
-// Class Constructors
-//-----------------------------------------------------------------------------
-LLViewerJoint::LLViewerJoint() :
-	LLAvatarJoint()
-{ }
-
-LLViewerJoint::LLViewerJoint(S32 joint_num) :
-	LLAvatarJoint(joint_num)
-{ }
-
-LLViewerJoint::LLViewerJoint(const std::string &name, LLJoint *parent) :
-	LLAvatarJoint(name, parent)
-{ }
-
-//-----------------------------------------------------------------------------
-// ~LLViewerJoint()
-// Class Destructor
-//-----------------------------------------------------------------------------
-LLViewerJoint::~LLViewerJoint()
-{
-}
-
-//--------------------------------------------------------------------
-// render()
-//--------------------------------------------------------------------
-U32 LLViewerJoint::render( F32 pixelArea, bool first_pass, bool is_dummy )
-{
-	stop_glerror();
-
-	U32 triangle_count = 0;
-
-	//----------------------------------------------------------------
-	// ignore invisible objects
-	//----------------------------------------------------------------
-	if ( mValid )
-	{
-
-
-		//----------------------------------------------------------------
-		// if object is transparent, defer it, otherwise
-		// give the joint subclass a chance to draw itself
-		//----------------------------------------------------------------
-		if ( is_dummy )
-		{
-			triangle_count += drawShape( pixelArea, first_pass, is_dummy );
-		}
-		else if (LLPipeline::sShadowRender)
-		{
-			triangle_count += drawShape(pixelArea, first_pass, is_dummy );
-		}
-		else if ( isTransparent() && !LLPipeline::sReflectionRender)
-		{
-			// Hair and Skirt
-			if ((pixelArea > MIN_PIXEL_AREA_3PASS_HAIR))
-			{
-				// render all three passes
-				LLGLDisable cull(GL_CULL_FACE);
-				// first pass renders without writing to the z buffer
-				{
-					LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
-					triangle_count += drawShape( pixelArea, first_pass, is_dummy );
-				}
-				// second pass writes to z buffer only
-				gGL.setColorMask(false, false);
-				{
-					triangle_count += drawShape( pixelArea, false, is_dummy  );
-				}
-				// third past respects z buffer and writes color
-				gGL.setColorMask(true, false);
-				{
-					LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
-					triangle_count += drawShape( pixelArea, false, is_dummy  );
-				}
-			}
-			else
-			{
-				// Render Inside (no Z buffer write)
-				glCullFace(GL_FRONT);
-				{
-					LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
-					triangle_count += drawShape( pixelArea, first_pass, is_dummy  );
-				}
-				// Render Outside (write to the Z buffer)
-				glCullFace(GL_BACK);
-				{
-					triangle_count += drawShape( pixelArea, false, is_dummy  );
-				}
-			}
-		}
-		else
-		{
-			// set up render state
-			triangle_count += drawShape( pixelArea, first_pass );
-		}
-	}
-
-	//----------------------------------------------------------------
-	// render children
-	//----------------------------------------------------------------
-	for (LLJoint* j : mChildren)
-	{
-		// LLViewerJoint is derived from LLAvatarJoint,
-		// all children of LLAvatarJoint are assumed to be LLAvatarJoint
-		LLAvatarJoint* joint = static_cast<LLAvatarJoint*>(j);
-		F32 jointLOD = joint->getLOD();
-		if (pixelArea >= jointLOD || sDisableLOD)
-		{
-			triangle_count += joint->render( pixelArea, true, is_dummy );
-
-			if (jointLOD != DEFAULT_AVATAR_JOINT_LOD)
-			{
-				break;
-			}
-		}
-	}
-
-	return triangle_count;
-}
-
-//--------------------------------------------------------------------
-// drawShape()
-//--------------------------------------------------------------------
-U32 LLViewerJoint::drawShape( F32 pixelArea, bool first_pass, bool is_dummy )
-{
-	return 0;
-}
-
-// End
+/**

+ * @file llviewerjoint.cpp

+ * @brief Implementation of LLViewerJoint 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$

+ */

+

+//-----------------------------------------------------------------------------

+// Header Files

+//-----------------------------------------------------------------------------

+#include "llviewerprecompiledheaders.h"

+

+#include "llviewerjoint.h"

+

+#include "llgl.h"

+#include "llrender.h"

+#include "llmath.h"

+#include "llglheaders.h"

+#include "llvoavatar.h"

+#include "pipeline.h"

+

+static constexpr S32 MIN_PIXEL_AREA_3PASS_HAIR = 64*64;

+

+//-----------------------------------------------------------------------------

+// LLViewerJoint()

+// Class Constructors

+//-----------------------------------------------------------------------------

+LLViewerJoint::LLViewerJoint() :

+    LLAvatarJoint()

+{ }

+

+LLViewerJoint::LLViewerJoint(S32 joint_num) :

+    LLAvatarJoint(joint_num)

+{ }

+

+LLViewerJoint::LLViewerJoint(const std::string &name, LLJoint *parent) :

+    LLAvatarJoint(name, parent)

+{ }

+

+//-----------------------------------------------------------------------------

+// ~LLViewerJoint()

+// Class Destructor

+//-----------------------------------------------------------------------------

+LLViewerJoint::~LLViewerJoint()

+{

+}

+

+//--------------------------------------------------------------------

+// render()

+//--------------------------------------------------------------------

+U32 LLViewerJoint::render( F32 pixelArea, bool first_pass, bool is_dummy )

+{

+    stop_glerror();

+

+    U32 triangle_count = 0;

+

+    //----------------------------------------------------------------

+    // ignore invisible objects

+    //----------------------------------------------------------------

+    if ( mValid )

+    {

+

+

+        //----------------------------------------------------------------

+        // if object is transparent, defer it, otherwise

+        // give the joint subclass a chance to draw itself

+        //----------------------------------------------------------------

+        if ( is_dummy )

+        {

+            triangle_count += drawShape( pixelArea, first_pass, is_dummy );

+        }

+        else if (LLPipeline::sShadowRender)

+        {

+            triangle_count += drawShape(pixelArea, first_pass, is_dummy );

+        }

+        else if ( isTransparent() && !LLPipeline::sReflectionRender)

+        {

+            // Hair and Skirt

+            if ((pixelArea > MIN_PIXEL_AREA_3PASS_HAIR))

+            {

+                // render all three passes

+                LLGLDisable cull(GL_CULL_FACE);

+                // first pass renders without writing to the z buffer

+                {

+                    LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);

+                    triangle_count += drawShape( pixelArea, first_pass, is_dummy );

+                }

+                // second pass writes to z buffer only

+                gGL.setColorMask(false, false);

+                {

+                    triangle_count += drawShape( pixelArea, false, is_dummy  );

+                }

+                // third past respects z buffer and writes color

+                gGL.setColorMask(true, false);

+                {

+                    LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);

+                    triangle_count += drawShape( pixelArea, false, is_dummy  );

+                }

+            }

+            else

+            {

+                // Render Inside (no Z buffer write)

+                glCullFace(GL_FRONT);

+                {

+                    LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);

+                    triangle_count += drawShape( pixelArea, first_pass, is_dummy  );

+                }

+                // Render Outside (write to the Z buffer)

+                glCullFace(GL_BACK);

+                {

+                    triangle_count += drawShape( pixelArea, false, is_dummy  );

+                }

+            }

+        }

+        else

+        {

+            // set up render state

+            triangle_count += drawShape( pixelArea, first_pass );

+        }

+    }

+

+    //----------------------------------------------------------------

+    // render children

+    //----------------------------------------------------------------

+    for (LLJoint* j : mChildren)

+    {

+        // LLViewerJoint is derived from LLAvatarJoint,

+        // all children of LLAvatarJoint are assumed to be LLAvatarJoint

+        LLAvatarJoint* joint = static_cast<LLAvatarJoint*>(j);

+        F32 jointLOD = joint->getLOD();

+        if (pixelArea >= jointLOD || sDisableLOD)

+        {

+            triangle_count += joint->render( pixelArea, true, is_dummy );

+

+            if (jointLOD != DEFAULT_AVATAR_JOINT_LOD)

+            {

+                break;

+            }

+        }

+    }

+

+    return triangle_count;

+}

+

+//--------------------------------------------------------------------

+// drawShape()

+//--------------------------------------------------------------------

+U32 LLViewerJoint::drawShape( F32 pixelArea, bool first_pass, bool is_dummy )

+{

+    return 0;

+}

+

+// End