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

diff --git a/indra/test/llxorcipher_tut.cpp b/indra/test/llxorcipher_tut.cpp
index 55b3faaa61..9acac53604 100644
--- a/indra/test/llxorcipher_tut.cpp
+++ b/indra/test/llxorcipher_tut.cpp
@@ -7,25 +7,25 @@
  * $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$
  */
- 
+
 #include "linden_common.h"
 #include "lltut.h"
 #include "llxorcipher.h"
@@ -33,99 +33,99 @@
 
 namespace tut
 {
-	struct cipher
-	{
-	};
-	typedef test_group<cipher> cipher_t;
-	typedef cipher_t::object cipher_object_t;
-	tut::cipher_t tut_cipher("cipher");
+    struct cipher
+    {
+    };
+    typedef test_group<cipher> cipher_t;
+    typedef cipher_t::object cipher_object_t;
+    tut::cipher_t tut_cipher("cipher");
+
+    //encrypt->decrypt
+    template<> template<>
+    void cipher_object_t::test<1>()
+    {
+        const U32 len = 3;
+        const U8 pad[] = "abc";
+        const char str[] = "SecondLife";
+        const S32 str_len = sizeof(str);
+        U8 encrypted[str_len];
+        U8 decrypted[str_len];
+        LLXORCipher xorCipher(pad, len);
+        LLXORCipher xorCipher1(pad, len);
+
+        U32 length = xorCipher.requiredEncryptionSpace(50);
+        ensure("requiredEncryptionSpace() function failed", (length == 50));
 
-	//encrypt->decrypt
-	template<> template<>
-	void cipher_object_t::test<1>()
-	{
-		const U32 len = 3;
-		const U8 pad[] = "abc";
-		const char str[] = "SecondLife";
-		const S32 str_len = sizeof(str);
-		U8 encrypted[str_len];
-		U8 decrypted[str_len];
-		LLXORCipher xorCipher(pad, len);
-		LLXORCipher xorCipher1(pad, len);
+        U32 lenEncrypted = xorCipher.encrypt((U8 *) str, str_len, encrypted, str_len);
+        ensure("Encryption failed", (lenEncrypted == str_len));
+        U32 lenDecrypted = xorCipher1.decrypt(encrypted, str_len, decrypted, str_len);
+        ensure("Decryption failed", (lenDecrypted == str_len));
+        ensure_memory_matches("LLXORCipher Encrypt/Decrypt failed", str, str_len, decrypted, lenDecrypted);
+    }
 
-		U32 length = xorCipher.requiredEncryptionSpace(50);
-		ensure("requiredEncryptionSpace() function failed", (length == 50));
+    // operator=
+    template<> template<>
+    void cipher_object_t::test<2>()
+    {
+        const U8 pad[] = "ABCDEFGHIJKLMNOPQ"; // pad len longer than data to be ciphered
+        const U32 pad_len = sizeof(pad);
+        const U8 pad1[] = "SecondLife";
+        const U32 pad_len1 = sizeof(pad1);
+        const char str[] = "To Be Ciphered";
+        const S32 str_len = sizeof(str);
+        U8 encrypted[str_len];
+        U8 decrypted[str_len];
 
-		U32 lenEncrypted = xorCipher.encrypt((U8 *) str, str_len, encrypted, str_len);
-		ensure("Encryption failed", (lenEncrypted == str_len));
-		U32 lenDecrypted = xorCipher1.decrypt(encrypted, str_len, decrypted, str_len);
-		ensure("Decryption failed", (lenDecrypted == str_len));
-		ensure_memory_matches("LLXORCipher Encrypt/Decrypt failed", str, str_len, decrypted, lenDecrypted);	
-	}
+        LLXORCipher xorCipher(pad, pad_len);
+        LLXORCipher xorCipher1(pad1, pad_len1);
 
-	// operator=
-	template<> template<>
-	void cipher_object_t::test<2>()
-	{
-		const U8 pad[] = "ABCDEFGHIJKLMNOPQ"; // pad len longer than data to be ciphered
-		const U32 pad_len = sizeof(pad);
-		const U8 pad1[] = "SecondLife";
-		const U32 pad_len1 = sizeof(pad1);
-		const char str[] = "To Be Ciphered";
-		const S32 str_len = sizeof(str);
-		U8 encrypted[str_len];
-		U8 decrypted[str_len];
+        xorCipher.encrypt((U8 *) str, str_len, encrypted, str_len);
+        // make xorCipher1 same as xorCipher..so that xorCipher1 can decrypt what was
+        // encrypted using xorCipher
+        xorCipher1 = xorCipher;
+        U32 lenDecrypted = xorCipher1.decrypt(encrypted, str_len, decrypted, str_len);
+        ensure_memory_matches("LLXORCipher operator= failed", str, str_len, decrypted, lenDecrypted);
+    }
 
-		LLXORCipher xorCipher(pad, pad_len);
-		LLXORCipher xorCipher1(pad1, pad_len1);
+    //in place encrypt->decrypt
+    template<> template<>
+    void cipher_object_t::test<3>()
+    {
+        U32 padNum = 0x12349087;
+        const U8* pad = (U8*) &padNum;
+        const U32 pad_len = sizeof(U32);
+        char str[] = "To Be Ciphered a long string.........!!!.";
+        char str1[] = "To Be Ciphered a long string.........!!!."; // same as str
+        const S32 str_len = sizeof(str);
 
-		xorCipher.encrypt((U8 *) str, str_len, encrypted, str_len);
-		// make xorCipher1 same as xorCipher..so that xorCipher1 can decrypt what was 
-		// encrypted using xorCipher
-		xorCipher1 = xorCipher;
-		U32 lenDecrypted = xorCipher1.decrypt(encrypted, str_len, decrypted, str_len);
-		ensure_memory_matches("LLXORCipher operator= failed", str, str_len, decrypted, lenDecrypted);	
-	}
-	
-	//in place encrypt->decrypt
-	template<> template<>
-	void cipher_object_t::test<3>()
-	{
-		U32 padNum = 0x12349087;
-		const U8* pad = (U8*) &padNum;
-		const U32 pad_len = sizeof(U32);
-		char str[] = "To Be Ciphered a long string.........!!!.";
-		char str1[] = "To Be Ciphered a long string.........!!!."; // same as str
-		const S32 str_len = sizeof(str);
+        LLXORCipher xorCipher(pad, pad_len);
+        LLXORCipher xorCipher1(pad, pad_len);
+        xorCipher.encrypt((U8 *) str, str_len);
+        // it should not be the same as original data!
+        ensure("LLXORCipher: In Place encrypt failed", memcmp(str, str1, str_len) != 0);
+        xorCipher1.decrypt((U8 *) str, str_len);
+        // it should not be the same as original data!
+        ensure_memory_matches("LLXORCipher: In Place decrypt failed", str, str_len, str1, str_len);
+    }
 
-		LLXORCipher xorCipher(pad, pad_len);
-		LLXORCipher xorCipher1(pad, pad_len);
-		xorCipher.encrypt((U8 *) str, str_len);
-		// it should not be the same as original data!
-		ensure("LLXORCipher: In Place encrypt failed", memcmp(str, str1, str_len) != 0);
-		xorCipher1.decrypt((U8 *) str, str_len);
-		// it should not be the same as original data!
-		ensure_memory_matches("LLXORCipher: In Place decrypt failed", str, str_len, str1, str_len);
-	}
+    //LLNullCipher encrypt->decrypt
+    template<> template<>
+    void cipher_object_t::test<4>()
+    {
+        const char str[] = "SecondLife";
+        const S32 str_len = sizeof(str);
+        U8 encrypted[str_len];
+        U8 decrypted[str_len];
+        LLNullCipher nullCipher;
+        LLNullCipher nullCipher1;
 
-	//LLNullCipher encrypt->decrypt
-	template<> template<>
-	void cipher_object_t::test<4>()
-	{
-		const char str[] = "SecondLife";
-		const S32 str_len = sizeof(str);
-		U8 encrypted[str_len];
-		U8 decrypted[str_len];
-		LLNullCipher nullCipher;
-		LLNullCipher nullCipher1;
+        U32 length = nullCipher.requiredEncryptionSpace(50);
+        ensure("LLNullCipher::requiredEncryptionSpace() function failed", (length == 50));
 
-		U32 length = nullCipher.requiredEncryptionSpace(50);
-		ensure("LLNullCipher::requiredEncryptionSpace() function failed", (length == 50));
+        U32 len1 = nullCipher.encrypt((U8 *) str, str_len, encrypted, str_len);
+        ensure_memory_matches("LLNullCipher - Source transformed during encryption.", encrypted, len1, str, str_len);
 
-		U32 len1 = nullCipher.encrypt((U8 *) str, str_len, encrypted, str_len);
-		ensure_memory_matches("LLNullCipher - Source transformed during encryption.", encrypted, len1, str, str_len);
-		
-		U32 len2 = nullCipher1.decrypt(encrypted, str_len, decrypted, str_len);
-		ensure_memory_matches("LLNullCipher - Decryption failed", decrypted, len2, str, str_len);
-	}
+        U32 len2 = nullCipher1.decrypt(encrypted, str_len, decrypted, str_len);
+        ensure_memory_matches("LLNullCipher - Decryption failed", decrypted, len2, str, str_len);
+    }
 }