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

diff --git a/indra/llappearance/lltexglobalcolor.cpp b/indra/llappearance/lltexglobalcolor.cpp
index cd416d6791..d01a7cb3d3 100644
--- a/indra/llappearance/lltexglobalcolor.cpp
+++ b/indra/llappearance/lltexglobalcolor.cpp
@@ -1,165 +1,165 @@
-/** 
- * @file lltexlayerglobalcolor.cpp
- * @brief Color for texture layers.
- *
- * $LicenseInfo:firstyear=2008&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 "linden_common.h"
-#include "llavatarappearance.h"
-#include "lltexlayer.h"
-#include "lltexglobalcolor.h"
-
-class LLWearable;
-
-//-----------------------------------------------------------------------------
-// LLTexGlobalColor
-//-----------------------------------------------------------------------------
-
-LLTexGlobalColor::LLTexGlobalColor(LLAvatarAppearance* appearance)
-	:
-	mAvatarAppearance(appearance),
-	mInfo(NULL)
-{
-}
-
-LLTexGlobalColor::~LLTexGlobalColor()
-{
-	// mParamColorList are LLViewerVisualParam's and get deleted with ~LLCharacter()
-	//std::for_each(mParamColorList.begin(), mParamColorList.end(), DeletePointer());
-}
-
-bool LLTexGlobalColor::setInfo(LLTexGlobalColorInfo *info)
-{
-	llassert(mInfo == NULL);
-	mInfo = info;
-	//mID = info->mID; // No ID
-
-	mParamGlobalColorList.reserve(mInfo->mParamColorInfoList.size());
-	for (LLTexLayerParamColorInfo* color_info : mInfo->mParamColorInfoList)
-	{
-		LLTexParamGlobalColor* param_color = new LLTexParamGlobalColor(this);
-		if (!param_color->setInfo(color_info, true))
-		{
-			mInfo = NULL;
-			return false;
-		}
-		mParamGlobalColorList.push_back(param_color);
-	}
-	
-	return true;
-}
-
-LLColor4 LLTexGlobalColor::getColor() const
-{
-	// Sum of color params
-	if (mParamGlobalColorList.empty())
-		return LLColor4(1.f, 1.f, 1.f, 1.f);
-
-	LLColor4 net_color(0.f, 0.f, 0.f, 0.f);
-	LLTexLayer::calculateTexLayerColor(mParamGlobalColorList, net_color);
-	return net_color;
-}
-
-const std::string& LLTexGlobalColor::getName() const
-{ 
-	return mInfo->mName; 
-}
-
-//-----------------------------------------------------------------------------
-// LLTexParamGlobalColor
-//-----------------------------------------------------------------------------
-LLTexParamGlobalColor::LLTexParamGlobalColor(LLTexGlobalColor* tex_global_color)
-	: LLTexLayerParamColor(tex_global_color->getAvatarAppearance()),
-	mTexGlobalColor(tex_global_color)
-{
-}
-
-//-----------------------------------------------------------------------------
-// LLTexParamGlobalColor
-//-----------------------------------------------------------------------------
-LLTexParamGlobalColor::LLTexParamGlobalColor(const LLTexParamGlobalColor& pOther)
-	: LLTexLayerParamColor(pOther),
-	mTexGlobalColor(pOther.mTexGlobalColor)
-{
-}
-
-//-----------------------------------------------------------------------------
-// ~LLTexParamGlobalColor
-//-----------------------------------------------------------------------------
-LLTexParamGlobalColor::~LLTexParamGlobalColor()
-{
-}
-
-/*virtual*/ LLViewerVisualParam* LLTexParamGlobalColor::cloneParam(LLWearable* wearable) const
-{
-	return new LLTexParamGlobalColor(*this);
-}
-
-void LLTexParamGlobalColor::onGlobalColorChanged()
-{
-	mAvatarAppearance->onGlobalColorChanged(mTexGlobalColor);
-}
-
-//-----------------------------------------------------------------------------
-// LLTexGlobalColorInfo
-//-----------------------------------------------------------------------------
-
-LLTexGlobalColorInfo::LLTexGlobalColorInfo()
-{
-}
-
-
-LLTexGlobalColorInfo::~LLTexGlobalColorInfo()
-{
-	for_each(mParamColorInfoList.begin(), mParamColorInfoList.end(), DeletePointer());
-	mParamColorInfoList.clear();
-}
-
-bool LLTexGlobalColorInfo::parseXml(LLXmlTreeNode* node)
-{
-	// name attribute
-	static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name");
-	if (!node->getFastAttributeString(name_string, mName))
-	{
-		LL_WARNS() << "<global_color> element is missing name attribute." << LL_ENDL;
-		return false;
-	}
-	// <param> sub-element
-	for (LLXmlTreeNode* child = node->getChildByName("param");
-		 child;
-		 child = node->getNextNamedChild())
-	{
-		if (child->getChildByName("param_color"))
-		{
-			// <param><param_color/></param>
-			LLTexLayerParamColorInfo* info = new LLTexLayerParamColorInfo();
-			if (!info->parseXml(child))
-			{
-				delete info;
-				return false;
-			}
-			mParamColorInfoList.push_back(info);
-		}
-	}
-	return true;
-}
+/**

+ * @file lltexlayerglobalcolor.cpp

+ * @brief Color for texture layers.

+ *

+ * $LicenseInfo:firstyear=2008&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 "linden_common.h"

+#include "llavatarappearance.h"

+#include "lltexlayer.h"

+#include "lltexglobalcolor.h"

+

+class LLWearable;

+

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

+// LLTexGlobalColor

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

+

+LLTexGlobalColor::LLTexGlobalColor(LLAvatarAppearance* appearance)

+    :

+    mAvatarAppearance(appearance),

+    mInfo(NULL)

+{

+}

+

+LLTexGlobalColor::~LLTexGlobalColor()

+{

+    // mParamColorList are LLViewerVisualParam's and get deleted with ~LLCharacter()

+    //std::for_each(mParamColorList.begin(), mParamColorList.end(), DeletePointer());

+}

+

+bool LLTexGlobalColor::setInfo(LLTexGlobalColorInfo *info)

+{

+    llassert(mInfo == NULL);

+    mInfo = info;

+    //mID = info->mID; // No ID

+

+    mParamGlobalColorList.reserve(mInfo->mParamColorInfoList.size());

+    for (LLTexLayerParamColorInfo* color_info : mInfo->mParamColorInfoList)

+    {

+        LLTexParamGlobalColor* param_color = new LLTexParamGlobalColor(this);

+        if (!param_color->setInfo(color_info, true))

+        {

+            mInfo = NULL;

+            return false;

+        }

+        mParamGlobalColorList.push_back(param_color);

+    }

+

+    return true;

+}

+

+LLColor4 LLTexGlobalColor::getColor() const

+{

+    // Sum of color params

+    if (mParamGlobalColorList.empty())

+        return LLColor4(1.f, 1.f, 1.f, 1.f);

+

+    LLColor4 net_color(0.f, 0.f, 0.f, 0.f);

+    LLTexLayer::calculateTexLayerColor(mParamGlobalColorList, net_color);

+    return net_color;

+}

+

+const std::string& LLTexGlobalColor::getName() const

+{

+    return mInfo->mName;

+}

+

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

+// LLTexParamGlobalColor

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

+LLTexParamGlobalColor::LLTexParamGlobalColor(LLTexGlobalColor* tex_global_color)

+    : LLTexLayerParamColor(tex_global_color->getAvatarAppearance()),

+    mTexGlobalColor(tex_global_color)

+{

+}

+

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

+// LLTexParamGlobalColor

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

+LLTexParamGlobalColor::LLTexParamGlobalColor(const LLTexParamGlobalColor& pOther)

+    : LLTexLayerParamColor(pOther),

+    mTexGlobalColor(pOther.mTexGlobalColor)

+{

+}

+

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

+// ~LLTexParamGlobalColor

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

+LLTexParamGlobalColor::~LLTexParamGlobalColor()

+{

+}

+

+/*virtual*/ LLViewerVisualParam* LLTexParamGlobalColor::cloneParam(LLWearable* wearable) const

+{

+    return new LLTexParamGlobalColor(*this);

+}

+

+void LLTexParamGlobalColor::onGlobalColorChanged()

+{

+    mAvatarAppearance->onGlobalColorChanged(mTexGlobalColor);

+}

+

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

+// LLTexGlobalColorInfo

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

+

+LLTexGlobalColorInfo::LLTexGlobalColorInfo()

+{

+}

+

+

+LLTexGlobalColorInfo::~LLTexGlobalColorInfo()

+{

+    for_each(mParamColorInfoList.begin(), mParamColorInfoList.end(), DeletePointer());

+    mParamColorInfoList.clear();

+}

+

+bool LLTexGlobalColorInfo::parseXml(LLXmlTreeNode* node)

+{

+    // name attribute

+    static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name");

+    if (!node->getFastAttributeString(name_string, mName))

+    {

+        LL_WARNS() << "<global_color> element is missing name attribute." << LL_ENDL;

+        return false;

+    }

+    // <param> sub-element

+    for (LLXmlTreeNode* child = node->getChildByName("param");

+         child;

+         child = node->getNextNamedChild())

+    {

+        if (child->getChildByName("param_color"))

+        {

+            // <param><param_color/></param>

+            LLTexLayerParamColorInfo* info = new LLTexLayerParamColorInfo();

+            if (!info->parseXml(child))

+            {

+                delete info;

+                return false;

+            }

+            mParamColorInfoList.push_back(info);

+        }

+    }

+    return true;

+}