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

diff --git a/indra/newview/tests/llversioninfo_test.cpp b/indra/newview/tests/llversioninfo_test.cpp
index 51a6f8f113..8049e67fc5 100644
--- a/indra/newview/tests/llversioninfo_test.cpp
+++ b/indra/newview/tests/llversioninfo_test.cpp
@@ -1,24 +1,24 @@
-/** 
+/**
  * @file llversioninfo_test.cpp
  *
  * $LicenseInfo:firstyear=2010&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$
  */
@@ -40,82 +40,82 @@ namespace tut
 {
     struct versioninfo
     {
-		versioninfo()
-			: mResetChannel("Reset Channel")
-		{
-			std::ostringstream stream;
-			stream << LL_VIEWER_VERSION_MAJOR << "."
-				   << LL_VIEWER_VERSION_MINOR << "."
-				   << LL_VIEWER_VERSION_PATCH << "."
-				   << LL_VIEWER_VERSION_BUILD;
-			mVersion = stream.str();
-			stream.str("");
+        versioninfo()
+            : mResetChannel("Reset Channel")
+        {
+            std::ostringstream stream;
+            stream << LL_VIEWER_VERSION_MAJOR << "."
+                   << LL_VIEWER_VERSION_MINOR << "."
+                   << LL_VIEWER_VERSION_PATCH << "."
+                   << LL_VIEWER_VERSION_BUILD;
+            mVersion = stream.str();
+            stream.str("");
 
-			stream << LL_VIEWER_VERSION_MAJOR << "."
-				   << LL_VIEWER_VERSION_MINOR << "."
-				   << LL_VIEWER_VERSION_PATCH;
-			mShortVersion = stream.str();
-			stream.str("");
+            stream << LL_VIEWER_VERSION_MAJOR << "."
+                   << LL_VIEWER_VERSION_MINOR << "."
+                   << LL_VIEWER_VERSION_PATCH;
+            mShortVersion = stream.str();
+            stream.str("");
 
-			stream << ll_viewer_channel
-				   << " "
-				   << mVersion;
-			mVersionAndChannel = stream.str();
-			stream.str("");
+            stream << ll_viewer_channel
+                   << " "
+                   << mVersion;
+            mVersionAndChannel = stream.str();
+            stream.str("");
 
-			stream << mResetChannel
-				   << " "
-				   << mVersion;
-			mResetVersionAndChannel = stream.str();
-		}
-		std::string mResetChannel;
-		std::string mVersion;
-		std::string mShortVersion;
-		std::string mVersionAndChannel;
-		std::string mResetVersionAndChannel;
+            stream << mResetChannel
+                   << " "
+                   << mVersion;
+            mResetVersionAndChannel = stream.str();
+        }
+        std::string mResetChannel;
+        std::string mVersion;
+        std::string mShortVersion;
+        std::string mVersionAndChannel;
+        std::string mResetVersionAndChannel;
     };
-    
-	typedef test_group<versioninfo> versioninfo_t;
-	typedef versioninfo_t::object versioninfo_object_t;
-	tut::versioninfo_t tut_versioninfo("LLVersionInfo");
 
-	template<> template<>
-	void versioninfo_object_t::test<1>()
-	{   
-		std::cout << "What we parsed from CMake: " << LL_VIEWER_VERSION_BUILD << std::endl;
-		std::cout << "What we get from llversioninfo: " << LLVersionInfo::instance().getBuild() << std::endl;
-		ensure_equals("Major version", 
-					  LLVersionInfo::instance().getMajor(), 
-					  LL_VIEWER_VERSION_MAJOR);
-		ensure_equals("Minor version", 
-					  LLVersionInfo::instance().getMinor(), 
-					  LL_VIEWER_VERSION_MINOR);
-		ensure_equals("Patch version", 
-					  LLVersionInfo::instance().getPatch(), 
-					  LL_VIEWER_VERSION_PATCH);
-		ensure_equals("Build version", 
-					  LLVersionInfo::instance().getBuild(), 
-					  LL_VIEWER_VERSION_BUILD);
-		ensure_equals("Channel version", 
-					  LLVersionInfo::instance().getChannel(), 
-					  ll_viewer_channel);
-		ensure_equals("Version String", 
-					  LLVersionInfo::instance().getVersion(), 
-					  mVersion);
-		ensure_equals("Short Version String", 
-					  LLVersionInfo::instance().getShortVersion(), 
-					  mShortVersion);
-		ensure_equals("Version and channel String", 
-					  LLVersionInfo::instance().getChannelAndVersion(), 
-					  mVersionAndChannel);
+    typedef test_group<versioninfo> versioninfo_t;
+    typedef versioninfo_t::object versioninfo_object_t;
+    tut::versioninfo_t tut_versioninfo("LLVersionInfo");
+
+    template<> template<>
+    void versioninfo_object_t::test<1>()
+    {
+        std::cout << "What we parsed from CMake: " << LL_VIEWER_VERSION_BUILD << std::endl;
+        std::cout << "What we get from llversioninfo: " << LLVersionInfo::instance().getBuild() << std::endl;
+        ensure_equals("Major version",
+                      LLVersionInfo::instance().getMajor(),
+                      LL_VIEWER_VERSION_MAJOR);
+        ensure_equals("Minor version",
+                      LLVersionInfo::instance().getMinor(),
+                      LL_VIEWER_VERSION_MINOR);
+        ensure_equals("Patch version",
+                      LLVersionInfo::instance().getPatch(),
+                      LL_VIEWER_VERSION_PATCH);
+        ensure_equals("Build version",
+                      LLVersionInfo::instance().getBuild(),
+                      LL_VIEWER_VERSION_BUILD);
+        ensure_equals("Channel version",
+                      LLVersionInfo::instance().getChannel(),
+                      ll_viewer_channel);
+        ensure_equals("Version String",
+                      LLVersionInfo::instance().getVersion(),
+                      mVersion);
+        ensure_equals("Short Version String",
+                      LLVersionInfo::instance().getShortVersion(),
+                      mShortVersion);
+        ensure_equals("Version and channel String",
+                      LLVersionInfo::instance().getChannelAndVersion(),
+                      mVersionAndChannel);
 
-		LLVersionInfo::instance().resetChannel(mResetChannel);
-		ensure_equals("Reset channel version", 
-					  LLVersionInfo::instance().getChannel(), 
-					  mResetChannel);
+        LLVersionInfo::instance().resetChannel(mResetChannel);
+        ensure_equals("Reset channel version",
+                      LLVersionInfo::instance().getChannel(),
+                      mResetChannel);
 
-		ensure_equals("Reset Version and channel String", 
-					  LLVersionInfo::instance().getChannelAndVersion(), 
-					  mResetVersionAndChannel);
-	}
+        ensure_equals("Reset Version and channel String",
+                      LLVersionInfo::instance().getChannelAndVersion(),
+                      mResetVersionAndChannel);
+    }
 }