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

diff --git a/indra/llmath/llcoord.h b/indra/llmath/llcoord.h
index 9b76268afd..120556c9fe 100644
--- a/indra/llmath/llcoord.h
+++ b/indra/llmath/llcoord.h
@@ -1,24 +1,24 @@
-/** 
+/**
  * @file llcoord.h
  *
  * $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$
  */
@@ -37,10 +37,10 @@ typedef LLCoord<LL_COORD_TYPE_SCREEN> LLCoordScreen;
 
 struct LLCoordCommon
 {
-	LLCoordCommon(S32 x, S32 y) : mX(x), mY(y) {}
-	LLCoordCommon() : mX(0), mY(0) {}
-	S32 mX;
-	S32 mY;
+    LLCoordCommon(S32 x, S32 y) : mX(x), mY(y) {}
+    LLCoordCommon() : mX(0), mY(0) {}
+    S32 mX;
+    S32 mY;
 };
 
 // A two-dimensional pixel value
@@ -48,65 +48,65 @@ template<typename COORD_FRAME>
 class LLCoord : protected COORD_FRAME
 {
 public:
-	typedef LLCoord<COORD_FRAME> self_t;
-	typename COORD_FRAME::value_t	mX;
-	typename COORD_FRAME::value_t	mY;
-
-	LLCoord():	mX(0), mY(0)
-	{}
-	LLCoord(typename COORD_FRAME::value_t x, typename COORD_FRAME::value_t y): mX(x), mY(y)
-	{}
-
-	LLCoord(const LLCoordCommon& other)
-	{
-		COORD_FRAME::convertFromCommon(other);
-	}
-
-	LLCoordCommon convert() const
-	{
-		return COORD_FRAME::convertToCommon();
-	}
-
-	void set(typename COORD_FRAME::value_t x, typename COORD_FRAME::value_t y) { mX = x; mY = y;}
-	bool operator==(const self_t& other) const { return mX == other.mX && mY == other.mY; }
-	bool operator!=(const self_t& other) const { return !(*this == other); }
-
-	static const self_t& getTypedCoords(const COORD_FRAME& self) { return static_cast<const self_t&>(self); }
-	static self_t& getTypedCoords(COORD_FRAME& self) { return static_cast<self_t&>(self); }
+    typedef LLCoord<COORD_FRAME> self_t;
+    typename COORD_FRAME::value_t   mX;
+    typename COORD_FRAME::value_t   mY;
+
+    LLCoord():  mX(0), mY(0)
+    {}
+    LLCoord(typename COORD_FRAME::value_t x, typename COORD_FRAME::value_t y): mX(x), mY(y)
+    {}
+
+    LLCoord(const LLCoordCommon& other)
+    {
+        COORD_FRAME::convertFromCommon(other);
+    }
+
+    LLCoordCommon convert() const
+    {
+        return COORD_FRAME::convertToCommon();
+    }
+
+    void set(typename COORD_FRAME::value_t x, typename COORD_FRAME::value_t y) { mX = x; mY = y;}
+    bool operator==(const self_t& other) const { return mX == other.mX && mY == other.mY; }
+    bool operator!=(const self_t& other) const { return !(*this == other); }
+
+    static const self_t& getTypedCoords(const COORD_FRAME& self) { return static_cast<const self_t&>(self); }
+    static self_t& getTypedCoords(COORD_FRAME& self) { return static_cast<self_t&>(self); }
 };
 
-struct LL_COORD_TYPE_GL 
+struct LL_COORD_TYPE_GL
 {
-	typedef S32 value_t;
-
-	LLCoordCommon convertToCommon() const
-	{
-		const LLCoordGL& self = LLCoordGL::getTypedCoords(*this);
-		return LLCoordCommon(self.mX, self.mY);
-	}
-
-	void convertFromCommon(const LLCoordCommon& from)
-	{
-		LLCoordGL& self = LLCoordGL::getTypedCoords(*this);
-		self.mX = from.mX;
-		self.mY = from.mY;
-	}
+    typedef S32 value_t;
+
+    LLCoordCommon convertToCommon() const
+    {
+        const LLCoordGL& self = LLCoordGL::getTypedCoords(*this);
+        return LLCoordCommon(self.mX, self.mY);
+    }
+
+    void convertFromCommon(const LLCoordCommon& from)
+    {
+        LLCoordGL& self = LLCoordGL::getTypedCoords(*this);
+        self.mX = from.mX;
+        self.mY = from.mY;
+    }
 };
 
-struct LL_COORD_TYPE_WINDOW 
+struct LL_COORD_TYPE_WINDOW
 {
-	typedef S32 value_t;
+    typedef S32 value_t;
 
-	LLCoordCommon convertToCommon() const;
-	void convertFromCommon(const LLCoordCommon& from);
+    LLCoordCommon convertToCommon() const;
+    void convertFromCommon(const LLCoordCommon& from);
 };
 
-struct LL_COORD_TYPE_SCREEN 
+struct LL_COORD_TYPE_SCREEN
 {
-	typedef S32 value_t;
+    typedef S32 value_t;
 
-	LLCoordCommon convertToCommon() const;
-	void convertFromCommon(const LLCoordCommon& from);
+    LLCoordCommon convertToCommon() const;
+    void convertFromCommon(const LLCoordCommon& from);
 };
 
 #endif