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

diff --git a/indra/test/llsdtraits.h b/indra/test/llsdtraits.h
index 07f6193ce2..c872f101d0 100644
--- a/indra/test/llsdtraits.h
+++ b/indra/test/llsdtraits.h
@@ -5,21 +5,21 @@
  * $LicenseInfo:firstyear=2007&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,48 +34,48 @@ template<class T>
 class LLSDTraits
 {
  protected:
-	typedef T (LLSD::*Getter)() const;
-	
-	LLSD::Type type;
-	Getter getter;
-	
+    typedef T (LLSD::*Getter)() const;
+
+    LLSD::Type type;
+    Getter getter;
+
  public:
-	LLSDTraits();
-	
-	T get(const LLSD& actual)
-		{
-			return (actual.*getter)();
-		}
-	
-	bool checkType(const LLSD& actual)
-		{
-			return actual.type() == type;
-		}
+    LLSDTraits();
+
+    T get(const LLSD& actual)
+        {
+            return (actual.*getter)();
+        }
+
+    bool checkType(const LLSD& actual)
+        {
+            return actual.type() == type;
+        }
 };
 
 template<> inline
 LLSDTraits<LLSD::Boolean>::LLSDTraits()
-	: type(LLSD::TypeBoolean), getter(&LLSD::asBoolean)
+    : type(LLSD::TypeBoolean), getter(&LLSD::asBoolean)
 { }
 
 template<> inline
 LLSDTraits<LLSD::Integer>::LLSDTraits()
-	: type(LLSD::TypeInteger), getter(&LLSD::asInteger)
+    : type(LLSD::TypeInteger), getter(&LLSD::asInteger)
 { }
 
 template<> inline
 LLSDTraits<LLSD::Real>::LLSDTraits()
-	: type(LLSD::TypeReal), getter(&LLSD::asReal)
+    : type(LLSD::TypeReal), getter(&LLSD::asReal)
 { }
 
 template<> inline
 LLSDTraits<LLSD::UUID>::LLSDTraits()
-	: type(LLSD::TypeUUID), getter(&LLSD::asUUID)
+    : type(LLSD::TypeUUID), getter(&LLSD::asUUID)
 { }
 
 template<> inline
 LLSDTraits<LLSD::String>::LLSDTraits()
-	: type(LLSD::TypeString), getter(&LLSD::asString)
+    : type(LLSD::TypeString), getter(&LLSD::asString)
 { }
 
 template<>
@@ -84,17 +84,17 @@ class LLSDTraits<const char*> : public LLSDTraits<LLSD::String>
 
 template<> inline
 LLSDTraits<LLSD::Date>::LLSDTraits()
-	: type(LLSD::TypeDate), getter(&LLSD::asDate)
+    : type(LLSD::TypeDate), getter(&LLSD::asDate)
 { }
 
 template<> inline
 LLSDTraits<LLSD::URI>::LLSDTraits()
-	: type(LLSD::TypeURI), getter(&LLSD::asURI)
+    : type(LLSD::TypeURI), getter(&LLSD::asURI)
 { }
 
 template<> inline
 LLSDTraits<const LLSD::Binary&>::LLSDTraits()
-	: type(LLSD::TypeBinary), getter(&LLSD::asBinary)
+    : type(LLSD::TypeBinary), getter(&LLSD::asBinary)
 { }
 
 #endif // LLSDTRAITS_H