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

diff --git a/indra/newview/lldrawpooltree.cpp b/indra/newview/lldrawpooltree.cpp
index 1d9d25e6fe..dbe8c9934f 100644
--- a/indra/newview/lldrawpooltree.cpp
+++ b/indra/newview/lldrawpooltree.cpp
@@ -1,164 +1,164 @@
-/** 
- * @file lldrawpooltree.cpp
- * @brief LLDrawPoolTree class implementation
- *
- * $LicenseInfo:firstyear=2002&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$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "lldrawpooltree.h"
-
-#include "lldrawable.h"
-#include "llface.h"
-#include "llsky.h"
-#include "llvotree.h"
-#include "pipeline.h"
-#include "llviewercamera.h"
-#include "llviewershadermgr.h"
-#include "llrender.h"
-#include "llviewercontrol.h"
-#include "llviewerregion.h"
-#include "llenvironment.h"
-
-S32 LLDrawPoolTree::sDiffTex = 0;
-static LLGLSLShader* shader = NULL;
-
-LLDrawPoolTree::LLDrawPoolTree(LLViewerTexture *texturep) :
-	LLFacePool(POOL_TREE),
-	mTexturep(texturep)
-{
-	mTexturep->setAddressMode(LLTexUnit::TAM_WRAP);
-}
-
-//============================================
-// deferred implementation
-//============================================
-void LLDrawPoolTree::beginDeferredPass(S32 pass)
-{
-	LL_RECORD_BLOCK_TIME(FTM_RENDER_TREES);
-		
-	shader = &gDeferredTreeProgram;
-	shader->bind();
-	shader->setMinimumAlpha(0.5f);
-}
-
-void LLDrawPoolTree::renderDeferred(S32 pass)
-{
-    LL_PROFILE_ZONE_SCOPED;
-
-    if (mDrawFace.empty())
-    {
-        return;
-    }
-
-
-    gGL.getTexUnit(sDiffTex)->bindFast(mTexturep);
-    mTexturep->addTextureStats(1024.f * 1024.f); // <=== keep Linden tree textures at full res
-
-    for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();
-        iter != mDrawFace.end(); iter++)
-    {
-        LLFace* face = *iter;
-        LLVertexBuffer* buff = face->getVertexBuffer();
-
-        if (buff)
-        {
-            LLMatrix4* model_matrix = &(face->getDrawable()->getRegion()->mRenderMatrix);
-
-            if (model_matrix != gGLLastMatrix)
-            {
-                gGLLastMatrix = model_matrix;
-                gGL.loadMatrix(gGLModelView);
-                if (model_matrix)
-                {
-                    llassert(gGL.getMatrixMode() == LLRender::MM_MODELVIEW);
-                    gGL.multMatrix((GLfloat*)model_matrix->mMatrix);
-                }
-                gPipeline.mMatrixOpCount++;
-            }
-
-            buff->setBuffer();
-            buff->drawRange(LLRender::TRIANGLES, 0, buff->getNumVerts() - 1, buff->getNumIndices(), 0);
-        }
-    }
-}
-
-void LLDrawPoolTree::endDeferredPass(S32 pass)
-{
-	LL_RECORD_BLOCK_TIME(FTM_RENDER_TREES);
-		
-	shader->unbind();
-}
-
-//============================================
-// shadow implementation
-//============================================
-void LLDrawPoolTree::beginShadowPass(S32 pass)
-{
-    LL_PROFILE_ZONE_SCOPED;
-	
-	glPolygonOffset(gSavedSettings.getF32("RenderDeferredTreeShadowOffset"),
-					gSavedSettings.getF32("RenderDeferredTreeShadowBias"));
-
-    LLEnvironment& environment = LLEnvironment::instance();
-
-	gDeferredTreeShadowProgram.bind();
-    gDeferredTreeShadowProgram.uniform1i(LLShaderMgr::SUN_UP_FACTOR, environment.getIsSunUp() ? 1 : 0);
-	gDeferredTreeShadowProgram.setMinimumAlpha(0.5f);
-}
-
-void LLDrawPoolTree::renderShadow(S32 pass)
-{
-	renderDeferred(pass);
-}
-
-void LLDrawPoolTree::endShadowPass(S32 pass)
-{
-    LL_PROFILE_ZONE_SCOPED;
-	
-	glPolygonOffset(gSavedSettings.getF32("RenderDeferredSpotShadowOffset"),
-						gSavedSettings.getF32("RenderDeferredSpotShadowBias"));
-	gDeferredTreeShadowProgram.unbind();
-}
-
-bool LLDrawPoolTree::verify() const
-{
-	return true;
-}
-
-LLViewerTexture *LLDrawPoolTree::getTexture()
-{
-	return mTexturep;
-}
-
-LLViewerTexture *LLDrawPoolTree::getDebugTexture()
-{
-	return mTexturep;
-}
-
-
-LLColor3 LLDrawPoolTree::getDebugColor() const
-{
-	return LLColor3(1.f, 0.f, 1.f);
-}
-
+/**

+ * @file lldrawpooltree.cpp

+ * @brief LLDrawPoolTree class implementation

+ *

+ * $LicenseInfo:firstyear=2002&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$

+ */

+

+#include "llviewerprecompiledheaders.h"

+

+#include "lldrawpooltree.h"

+

+#include "lldrawable.h"

+#include "llface.h"

+#include "llsky.h"

+#include "llvotree.h"

+#include "pipeline.h"

+#include "llviewercamera.h"

+#include "llviewershadermgr.h"

+#include "llrender.h"

+#include "llviewercontrol.h"

+#include "llviewerregion.h"

+#include "llenvironment.h"

+

+S32 LLDrawPoolTree::sDiffTex = 0;

+static LLGLSLShader* shader = NULL;

+

+LLDrawPoolTree::LLDrawPoolTree(LLViewerTexture *texturep) :

+    LLFacePool(POOL_TREE),

+    mTexturep(texturep)

+{

+    mTexturep->setAddressMode(LLTexUnit::TAM_WRAP);

+}

+

+//============================================

+// deferred implementation

+//============================================

+void LLDrawPoolTree::beginDeferredPass(S32 pass)

+{

+    LL_RECORD_BLOCK_TIME(FTM_RENDER_TREES);

+

+    shader = &gDeferredTreeProgram;

+    shader->bind();

+    shader->setMinimumAlpha(0.5f);

+}

+

+void LLDrawPoolTree::renderDeferred(S32 pass)

+{

+    LL_PROFILE_ZONE_SCOPED;

+

+    if (mDrawFace.empty())

+    {

+        return;

+    }

+

+

+    gGL.getTexUnit(sDiffTex)->bindFast(mTexturep);

+    mTexturep->addTextureStats(1024.f * 1024.f); // <=== keep Linden tree textures at full res

+

+    for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();

+        iter != mDrawFace.end(); iter++)

+    {

+        LLFace* face = *iter;

+        LLVertexBuffer* buff = face->getVertexBuffer();

+

+        if (buff)

+        {

+            LLMatrix4* model_matrix = &(face->getDrawable()->getRegion()->mRenderMatrix);

+

+            if (model_matrix != gGLLastMatrix)

+            {

+                gGLLastMatrix = model_matrix;

+                gGL.loadMatrix(gGLModelView);

+                if (model_matrix)

+                {

+                    llassert(gGL.getMatrixMode() == LLRender::MM_MODELVIEW);

+                    gGL.multMatrix((GLfloat*)model_matrix->mMatrix);

+                }

+                gPipeline.mMatrixOpCount++;

+            }

+

+            buff->setBuffer();

+            buff->drawRange(LLRender::TRIANGLES, 0, buff->getNumVerts() - 1, buff->getNumIndices(), 0);

+        }

+    }

+}

+

+void LLDrawPoolTree::endDeferredPass(S32 pass)

+{

+    LL_RECORD_BLOCK_TIME(FTM_RENDER_TREES);

+

+    shader->unbind();

+}

+

+//============================================

+// shadow implementation

+//============================================

+void LLDrawPoolTree::beginShadowPass(S32 pass)

+{

+    LL_PROFILE_ZONE_SCOPED;

+

+    glPolygonOffset(gSavedSettings.getF32("RenderDeferredTreeShadowOffset"),

+                    gSavedSettings.getF32("RenderDeferredTreeShadowBias"));

+

+    LLEnvironment& environment = LLEnvironment::instance();

+

+    gDeferredTreeShadowProgram.bind();

+    gDeferredTreeShadowProgram.uniform1i(LLShaderMgr::SUN_UP_FACTOR, environment.getIsSunUp() ? 1 : 0);

+    gDeferredTreeShadowProgram.setMinimumAlpha(0.5f);

+}

+

+void LLDrawPoolTree::renderShadow(S32 pass)

+{

+    renderDeferred(pass);

+}

+

+void LLDrawPoolTree::endShadowPass(S32 pass)

+{

+    LL_PROFILE_ZONE_SCOPED;

+

+    glPolygonOffset(gSavedSettings.getF32("RenderDeferredSpotShadowOffset"),

+                        gSavedSettings.getF32("RenderDeferredSpotShadowBias"));

+    gDeferredTreeShadowProgram.unbind();

+}

+

+bool LLDrawPoolTree::verify() const

+{

+    return true;

+}

+

+LLViewerTexture *LLDrawPoolTree::getTexture()

+{

+    return mTexturep;

+}

+

+LLViewerTexture *LLDrawPoolTree::getDebugTexture()

+{

+    return mTexturep;

+}

+

+

+LLColor3 LLDrawPoolTree::getDebugColor() const

+{

+    return LLColor3(1.f, 0.f, 1.f);

+}

+