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

diff --git a/indra/llmath/v4coloru.cpp b/indra/llmath/v4coloru.cpp
index d238d609b4..500d8ed8ab 100644
--- a/indra/llmath/v4coloru.cpp
+++ b/indra/llmath/v4coloru.cpp
@@ -1,120 +1,120 @@
-/** 
- * @file v4coloru.cpp
- * @brief LLColor4U class implementation.
- *
- * $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$
- */
-
-#include "linden_common.h"
-
-//#include "v3coloru.h"
-#include "v4coloru.h"
-#include "v4color.h"
-//#include "vmath.h"
-#include "llmath.h"
-
-// LLColor4U
-LLColor4U LLColor4U::white(255, 255, 255, 255);
-LLColor4U LLColor4U::black(  0,   0,   0, 255);
-LLColor4U LLColor4U::red  (255,   0,   0, 255);
-LLColor4U LLColor4U::green(  0, 255,   0, 255);
-LLColor4U LLColor4U::blue (  0,   0, 255, 255);
-
-// conversion
-/* inlined to fix gcc compile link error
-LLColor4U::operator LLColor4()
-{
-	return(LLColor4((F32)mV[VRED]/255.f,(F32)mV[VGREEN]/255.f,(F32)mV[VBLUE]/255.f,(F32)mV[VALPHA]/255.f));
-}
-*/
-
-// Constructors
-
-
-/*
-LLColor4U::LLColor4U(const LLColor3 &vec)
-{
-	mV[VX] = vec.mV[VX];
-	mV[VY] = vec.mV[VY];
-	mV[VZ] = vec.mV[VZ];
-	mV[VW] = 255;
-}
-*/
-
-
-// Clear and Assignment Functions
-
-
-
-// LLColor4U Operators
-
-/*
-LLColor4U LLColor4U::operator=(const LLColor3 &a)
-{
-	mV[VX] = a.mV[VX];
-	mV[VY] = a.mV[VY];
-	mV[VZ] = a.mV[VZ];
-
-// converting from an rgb sets a=1 (opaque)
-	mV[VW] = 255;
-	return (*this);
-}
-*/
-
-
-std::ostream& operator<<(std::ostream& s, const LLColor4U &a) 
-{
-	s << "{ " << (S32)a.mV[VX] << ", " << (S32)a.mV[VY] << ", " << (S32)a.mV[VZ] << ", " << (S32)a.mV[VW] << " }";
-	return s;
-}
-
-// static
-bool LLColor4U::parseColor4U(const std::string& buf, LLColor4U* value)
-{
-	if( buf.empty() || value == nullptr)
-	{
-		return false;
-	}
-
-	U32 v[4];
-	S32 count = sscanf( buf.c_str(), "%u, %u, %u, %u", v + 0, v + 1, v + 2, v + 3 );
-	if (1 == count )
-	{
-		// try this format
-		count = sscanf( buf.c_str(), "%u %u %u %u", v + 0, v + 1, v + 2, v + 3 );
-	}
-	if( 4 != count )
-	{
-		return false;
-	}
-
-	for( S32 i = 0; i < 4; i++ )
-	{
-		if( v[i] > U8_MAX )
-		{
-			return false;
-		}
-	}
-
-	value->set( U8(v[0]), U8(v[1]), U8(v[2]), U8(v[3]) );
-	return true;
-}
+/**

+ * @file v4coloru.cpp

+ * @brief LLColor4U class implementation.

+ *

+ * $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$

+ */

+

+#include "linden_common.h"

+

+//#include "v3coloru.h"

+#include "v4coloru.h"

+#include "v4color.h"

+//#include "vmath.h"

+#include "llmath.h"

+

+// LLColor4U

+LLColor4U LLColor4U::white(255, 255, 255, 255);

+LLColor4U LLColor4U::black(  0,   0,   0, 255);

+LLColor4U LLColor4U::red  (255,   0,   0, 255);

+LLColor4U LLColor4U::green(  0, 255,   0, 255);

+LLColor4U LLColor4U::blue (  0,   0, 255, 255);

+

+// conversion

+/* inlined to fix gcc compile link error

+LLColor4U::operator LLColor4()

+{

+    return(LLColor4((F32)mV[VRED]/255.f,(F32)mV[VGREEN]/255.f,(F32)mV[VBLUE]/255.f,(F32)mV[VALPHA]/255.f));

+}

+*/

+

+// Constructors

+

+

+/*

+LLColor4U::LLColor4U(const LLColor3 &vec)

+{

+    mV[VX] = vec.mV[VX];

+    mV[VY] = vec.mV[VY];

+    mV[VZ] = vec.mV[VZ];

+    mV[VW] = 255;

+}

+*/

+

+

+// Clear and Assignment Functions

+

+

+

+// LLColor4U Operators

+

+/*

+LLColor4U LLColor4U::operator=(const LLColor3 &a)

+{

+    mV[VX] = a.mV[VX];

+    mV[VY] = a.mV[VY];

+    mV[VZ] = a.mV[VZ];

+

+// converting from an rgb sets a=1 (opaque)

+    mV[VW] = 255;

+    return (*this);

+}

+*/

+

+

+std::ostream& operator<<(std::ostream& s, const LLColor4U &a)

+{

+    s << "{ " << (S32)a.mV[VX] << ", " << (S32)a.mV[VY] << ", " << (S32)a.mV[VZ] << ", " << (S32)a.mV[VW] << " }";

+    return s;

+}

+

+// static

+bool LLColor4U::parseColor4U(const std::string& buf, LLColor4U* value)

+{

+    if( buf.empty() || value == nullptr)

+    {

+        return false;

+    }

+

+    U32 v[4];

+    S32 count = sscanf( buf.c_str(), "%u, %u, %u, %u", v + 0, v + 1, v + 2, v + 3 );

+    if (1 == count )

+    {

+        // try this format

+        count = sscanf( buf.c_str(), "%u %u %u %u", v + 0, v + 1, v + 2, v + 3 );

+    }

+    if( 4 != count )

+    {

+        return false;

+    }

+

+    for( S32 i = 0; i < 4; i++ )

+    {

+        if( v[i] > U8_MAX )

+        {

+            return false;

+        }

+    }

+

+    value->set( U8(v[0]), U8(v[1]), U8(v[2]), U8(v[3]) );

+    return true;

+}