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

diff --git a/indra/llrender/llglstates.h b/indra/llrender/llglstates.h
index 930c5e3ed7..9bb980d7ad 100644
--- a/indra/llrender/llglstates.h
+++ b/indra/llrender/llglstates.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llglstates.h
  * @brief LLGL states definitions
  *
  * $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$
  */
@@ -34,21 +34,21 @@
 
 class LLGLDepthTest
 {
-	// Enabled by default
+    // Enabled by default
 public:
-	LLGLDepthTest(GLboolean depth_enabled, GLboolean write_enabled = GL_TRUE, GLenum depth_func = GL_LEQUAL);
-	
-	~LLGLDepthTest();
-	
-	void checkState();
-
-	GLboolean mPrevDepthEnabled;
-	GLenum mPrevDepthFunc;
-	GLboolean mPrevWriteEnabled;
+    LLGLDepthTest(GLboolean depth_enabled, GLboolean write_enabled = GL_TRUE, GLenum depth_func = GL_LEQUAL);
+
+    ~LLGLDepthTest();
+
+    void checkState();
+
+    GLboolean mPrevDepthEnabled;
+    GLenum mPrevDepthFunc;
+    GLboolean mPrevWriteEnabled;
 private:
-	static GLboolean sDepthEnabled; // defaults to GL_FALSE
-	static GLenum sDepthFunc; // defaults to GL_LESS
-	static GLboolean sWriteEnabled; // defaults to GL_TRUE
+    static GLboolean sDepthEnabled; // defaults to GL_FALSE
+    static GLenum sDepthFunc; // defaults to GL_LESS
+    static GLboolean sWriteEnabled; // defaults to GL_TRUE
 };
 
 //----------------------------------------------------------------------------
@@ -58,110 +58,110 @@ class LLGLSDefault
 protected:
     LLGLDisable mBlend, mCullFace;
 public:
-	LLGLSDefault()
-		:
-		// Disable
-		mBlend(GL_BLEND), 
-		mCullFace(GL_CULL_FACE)
-	{ }
+    LLGLSDefault()
+        :
+        // Disable
+        mBlend(GL_BLEND),
+        mCullFace(GL_CULL_FACE)
+    { }
 };
 
 class LLGLSObjectSelect
-{ 
+{
 protected:
-	LLGLDisable mBlend;
-	LLGLEnable mCullFace;
+    LLGLDisable mBlend;
+    LLGLEnable mCullFace;
 public:
-	LLGLSObjectSelect()
-		: mBlend(GL_BLEND), 
-		  mCullFace(GL_CULL_FACE)
-	{ }
+    LLGLSObjectSelect()
+        : mBlend(GL_BLEND),
+          mCullFace(GL_CULL_FACE)
+    { }
 };
 
 //----------------------------------------------------------------------------
 
 class LLGLSUIDefault
-{ 
+{
 protected:
-	LLGLEnable mBlend;
-	LLGLDisable mCullFace;
-	LLGLDepthTest mDepthTest;
+    LLGLEnable mBlend;
+    LLGLDisable mCullFace;
+    LLGLDepthTest mDepthTest;
 public:
-	LLGLSUIDefault() 
-		: mBlend(GL_BLEND),
-		  mCullFace(GL_CULL_FACE),
-		  mDepthTest(GL_FALSE, GL_TRUE, GL_LEQUAL)
-	{}
+    LLGLSUIDefault()
+        : mBlend(GL_BLEND),
+          mCullFace(GL_CULL_FACE),
+          mDepthTest(GL_FALSE, GL_TRUE, GL_LEQUAL)
+    {}
 };
 
 //----------------------------------------------------------------------------
 
 class LLGLSPipeline
-{ 
+{
 protected:
-	LLGLEnable mCullFace;
-	LLGLDepthTest mDepthTest;
+    LLGLEnable mCullFace;
+    LLGLDepthTest mDepthTest;
 public:
-	LLGLSPipeline()
-		: mCullFace(GL_CULL_FACE),
-		  mDepthTest(GL_TRUE, GL_TRUE, GL_LEQUAL)
-	{ }		
+    LLGLSPipeline()
+        : mCullFace(GL_CULL_FACE),
+          mDepthTest(GL_TRUE, GL_TRUE, GL_LEQUAL)
+    { }
 };
 
 class LLGLSPipelineAlpha // : public LLGLSPipeline
-{ 
+{
 protected:
-	LLGLEnable mBlend;
+    LLGLEnable mBlend;
 public:
-	LLGLSPipelineAlpha()
-		: mBlend(GL_BLEND)
-	{ }
+    LLGLSPipelineAlpha()
+        : mBlend(GL_BLEND)
+    { }
 };
 
 class LLGLSPipelineSelection
-{ 
+{
 protected:
-	LLGLDisable mCullFace;
+    LLGLDisable mCullFace;
 public:
-	LLGLSPipelineSelection()
-		: mCullFace(GL_CULL_FACE)
-	{}
+    LLGLSPipelineSelection()
+        : mCullFace(GL_CULL_FACE)
+    {}
 };
 
 class LLGLSPipelineSkyBox
-{ 
+{
 protected:
     LLGLDisable mCullFace;
     LLGLSquashToFarClip mSquashClip;
 public:
-	LLGLSPipelineSkyBox();
+    LLGLSPipelineSkyBox();
    ~LLGLSPipelineSkyBox();
 };
 
 class LLGLSPipelineDepthTestSkyBox : public LLGLSPipelineSkyBox
-{ 
+{
 public:
-	LLGLSPipelineDepthTestSkyBox(bool depth_test, bool depth_write);
+    LLGLSPipelineDepthTestSkyBox(bool depth_test, bool depth_write);
 
     LLGLDepthTest mDepth;
 };
 
-class LLGLSPipelineBlendSkyBox : public LLGLSPipelineDepthTestSkyBox 
-{ 
+class LLGLSPipelineBlendSkyBox : public LLGLSPipelineDepthTestSkyBox
+{
 public:
-	LLGLSPipelineBlendSkyBox(bool depth_test, bool depth_write);
-    LLGLEnable mBlend;    
+    LLGLSPipelineBlendSkyBox(bool depth_test, bool depth_write);
+    LLGLEnable mBlend;
 };
 
 class LLGLSTracker
 {
 protected:
-	LLGLEnable mCullFace, mBlend;
+    LLGLEnable mCullFace, mBlend;
 public:
-	LLGLSTracker() :
-		mCullFace(GL_CULL_FACE),
-		mBlend(GL_BLEND)
-	{ }
+    LLGLSTracker() :
+        mCullFace(GL_CULL_FACE),
+        mBlend(GL_BLEND)
+    { }
 };
 
 //----------------------------------------------------------------------------
@@ -169,26 +169,26 @@ public:
 class LLGLSSpecular
 {
 public:
-	F32 mShininess;
-	LLGLSSpecular(const LLColor4& color, F32 shininess)
-	{
-		mShininess = shininess;
-		if (mShininess > 0.0f)
-		{
-			glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, color.mV);
-			S32 shiny = (S32)(shininess*128.f);
-			shiny = llclamp(shiny,0,128);
-			glMateriali(GL_FRONT_AND_BACK, GL_SHININESS, shiny);
-		}
-	}
-	~LLGLSSpecular()
-	{
-		if (mShininess > 0.f)
-		{
-			glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, LLColor4(0.f,0.f,0.f,0.f).mV);
-			glMateriali(GL_FRONT_AND_BACK, GL_SHININESS, 0);
-		}
-	}
+    F32 mShininess;
+    LLGLSSpecular(const LLColor4& color, F32 shininess)
+    {
+        mShininess = shininess;
+        if (mShininess > 0.0f)
+        {
+            glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, color.mV);
+            S32 shiny = (S32)(shininess*128.f);
+            shiny = llclamp(shiny,0,128);
+            glMateriali(GL_FRONT_AND_BACK, GL_SHININESS, shiny);
+        }
+    }
+    ~LLGLSSpecular()
+    {
+        if (mShininess > 0.f)
+        {
+            glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, LLColor4(0.f,0.f,0.f,0.f).mV);
+            glMateriali(GL_FRONT_AND_BACK, GL_SHININESS, 0);
+        }
+    }
 };
 
 //----------------------------------------------------------------------------