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

diff --git a/indra/test/llblowfish_tut.cpp b/indra/test/llblowfish_tut.cpp
index 18eb01363f..a8690ccb33 100644
--- a/indra/test/llblowfish_tut.cpp
+++ b/indra/test/llblowfish_tut.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llblowfish_tut.cpp
  * @author James Cook, james@lindenlab.com
  * @date 2007-02-04
@@ -10,21 +10,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$
  */
@@ -38,104 +38,104 @@
 
 namespace tut
 {
-	class LLData
-	{
-	public:
-		unsigned char* mInput;
-		int mInputSize;
-
-		LLData()
-		{
-			// \n to make it easier to create text files
-			// for testing with command line openssl
-			mInput = (unsigned char*)"01234567890123456789012345678901234\n";
-			mInputSize = 36;
-		}
-
-		bool matchFile(const std::string& filename,
-					   const std::string& data)
-		{
-			LLFILE* fp = LLFile::fopen(filename, "rb");
-			if (!fp) 
-			{
-				// sometimes test is run inside the indra directory
-				std::string path = "test/";
-				path += filename;
-				fp = LLFile::fopen(path, "rb");
-			}
-			if (!fp)
-			{
-				LL_WARNS() << "unable to open " << filename << LL_ENDL;
-				return false;
-			}
-
-			std::string good;
-			good.resize(256);
-			size_t got = fread(&good[0], 1, 256, fp);
-			LL_DEBUGS() << "matchFile read " << got << LL_ENDL;
-			fclose(fp);
-			good.resize(got);
-		
-			return (good == data);
-		}
-	};
-	typedef test_group<LLData> blowfish_test;
-	typedef blowfish_test::object blowfish_object;
-	// Create test with name that can be selected on
-	// command line of test app.
-	tut::blowfish_test blowfish("blowfish");
-
-	template<> template<>
-	void blowfish_object::test<1>()
-	{
-		LLUUID blank;
-		LLBlowfishCipher cipher(&blank.mData[0], UUID_BYTES);
-
-		U32 dst_len = cipher.requiredEncryptionSpace(36);
-		ensure("encryption space 36",
-				(dst_len == 40) );
-
-		// Blowfish adds an additional 8-byte block if your
-		// input is an exact multiple of 8
-		dst_len = cipher.requiredEncryptionSpace(8);
-		ensure("encryption space 8",
-				(dst_len == 16)  );
-	}
-
-	template<> template<>
-	void blowfish_object::test<2>()
-	{
-		LLUUID blank;
-		LLBlowfishCipher cipher(&blank.mData[0], UUID_BYTES);
-
-		std::string result;
-		result.resize(256);
-		U32 count = cipher.encrypt(mInput, mInputSize,
-				(U8*) &result[0], 256);
-
-		ensure("encrypt output count",
-				(count == 40) );
-		result.resize(count);
-
-		ensure("encrypt null key", matchFile("blowfish.1.bin", result));
-	}
-
-	template<> template<>
-	void blowfish_object::test<3>()
-	{
+    class LLData
+    {
+    public:
+        unsigned char* mInput;
+        int mInputSize;
+
+        LLData()
+        {
+            // \n to make it easier to create text files
+            // for testing with command line openssl
+            mInput = (unsigned char*)"01234567890123456789012345678901234\n";
+            mInputSize = 36;
+        }
+
+        bool matchFile(const std::string& filename,
+                       const std::string& data)
+        {
+            LLFILE* fp = LLFile::fopen(filename, "rb");
+            if (!fp)
+            {
+                // sometimes test is run inside the indra directory
+                std::string path = "test/";
+                path += filename;
+                fp = LLFile::fopen(path, "rb");
+            }
+            if (!fp)
+            {
+                LL_WARNS() << "unable to open " << filename << LL_ENDL;
+                return false;
+            }
+
+            std::string good;
+            good.resize(256);
+            size_t got = fread(&good[0], 1, 256, fp);
+            LL_DEBUGS() << "matchFile read " << got << LL_ENDL;
+            fclose(fp);
+            good.resize(got);
+
+            return (good == data);
+        }
+    };
+    typedef test_group<LLData> blowfish_test;
+    typedef blowfish_test::object blowfish_object;
+    // Create test with name that can be selected on
+    // command line of test app.
+    tut::blowfish_test blowfish("blowfish");
+
+    template<> template<>
+    void blowfish_object::test<1>()
+    {
+        LLUUID blank;
+        LLBlowfishCipher cipher(&blank.mData[0], UUID_BYTES);
+
+        U32 dst_len = cipher.requiredEncryptionSpace(36);
+        ensure("encryption space 36",
+                (dst_len == 40) );
+
+        // Blowfish adds an additional 8-byte block if your
+        // input is an exact multiple of 8
+        dst_len = cipher.requiredEncryptionSpace(8);
+        ensure("encryption space 8",
+                (dst_len == 16)  );
+    }
+
+    template<> template<>
+    void blowfish_object::test<2>()
+    {
+        LLUUID blank;
+        LLBlowfishCipher cipher(&blank.mData[0], UUID_BYTES);
+
+        std::string result;
+        result.resize(256);
+        U32 count = cipher.encrypt(mInput, mInputSize,
+                (U8*) &result[0], 256);
+
+        ensure("encrypt output count",
+                (count == 40) );
+        result.resize(count);
+
+        ensure("encrypt null key", matchFile("blowfish.1.bin", result));
+    }
+
+    template<> template<>
+    void blowfish_object::test<3>()
+    {
         // same as base64 test id
-		LLUUID id("526a1e07-a19d-baed-84c4-ff08a488d15e");
-		LLBlowfishCipher cipher(&id.mData[0], UUID_BYTES);
+        LLUUID id("526a1e07-a19d-baed-84c4-ff08a488d15e");
+        LLBlowfishCipher cipher(&id.mData[0], UUID_BYTES);
 
-		std::string result;
-		result.resize(256);
-		U32 count = cipher.encrypt(mInput, mInputSize,
-				(U8*) &result[0], 256);
+        std::string result;
+        result.resize(256);
+        U32 count = cipher.encrypt(mInput, mInputSize,
+                (U8*) &result[0], 256);
 
-		ensure("encrypt output count",
-				(count == 40) );
-		result.resize(count);
+        ensure("encrypt output count",
+                (count == 40) );
+        result.resize(count);
 
-		ensure("encrypt real key", matchFile("blowfish.2.bin", result));
-	}
+        ensure("encrypt real key", matchFile("blowfish.2.bin", result));
+    }
 }