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

diff --git a/indra/test/lltimestampcache_tut.cpp b/indra/test/lltimestampcache_tut.cpp
index 857a17a6d5..857dfe6e6e 100644
--- a/indra/test/lltimestampcache_tut.cpp
+++ b/indra/test/lltimestampcache_tut.cpp
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2008&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,91 +34,91 @@
 
 namespace tut
 {
-	struct LLTimestampCacheTestData
-	{
-	};
+    struct LLTimestampCacheTestData
+    {
+    };
 
-	typedef test_group<LLTimestampCacheTestData> LLTimestampCacheTestGroup;
-	typedef LLTimestampCacheTestGroup::object LLTimestampCacheTestObject;
+    typedef test_group<LLTimestampCacheTestData> LLTimestampCacheTestGroup;
+    typedef LLTimestampCacheTestGroup::object LLTimestampCacheTestObject;
 
-	LLTimestampCacheTestGroup timestampCacheTestGroup("LLTimestampCache");
+    LLTimestampCacheTestGroup timestampCacheTestGroup("LLTimestampCache");
 
-	// Most common usage
-	template<> template<>
-		void LLTimestampCacheTestObject::test<1>()
-		{
-			LLTimestampCache<std::string, std::string> cache;
-			// put in some data
-			cache.insert("key1", "val1", 1);
-			cache.insert("key2", "val2", 2);
-			cache.insert("key3", "val3", 3);
-			ensure_equals("size is 3", cache.size(), 3);
-			// check some items
-			ensure("has key1", cache.has("key1"));
-			ensure("no invalid key", !cache.has("invalid key"));
-			// get some items
-			ensure_equals("get key1", cache.get("key1", 4), "val1");
-			ensure_equals("get invalid key", 
-					cache.get("invalid key", 4), std::string() );
-			// timestamps
-			ensure_equals("key1 timestamp updated", cache.getTimestamp("key1"), 4);
-			ensure_equals("invalid key timestamp", 
-					cache.getTimestamp("invalid key"), 0);
-		}
+    // Most common usage
+    template<> template<>
+        void LLTimestampCacheTestObject::test<1>()
+        {
+            LLTimestampCache<std::string, std::string> cache;
+            // put in some data
+            cache.insert("key1", "val1", 1);
+            cache.insert("key2", "val2", 2);
+            cache.insert("key3", "val3", 3);
+            ensure_equals("size is 3", cache.size(), 3);
+            // check some items
+            ensure("has key1", cache.has("key1"));
+            ensure("no invalid key", !cache.has("invalid key"));
+            // get some items
+            ensure_equals("get key1", cache.get("key1", 4), "val1");
+            ensure_equals("get invalid key",
+                    cache.get("invalid key", 4), std::string() );
+            // timestamps
+            ensure_equals("key1 timestamp updated", cache.getTimestamp("key1"), 4);
+            ensure_equals("invalid key timestamp",
+                    cache.getTimestamp("invalid key"), 0);
+        }
 
-	// New empty cache shouldn't have any entries
-	template<> template<>
-		void LLTimestampCacheTestObject::test<2>()
-		{
-			LLTimestampCache<std::string, std::string> cache;
-			ensure_equals("starts empty",   cache.size(), 0);
-			ensure_equals("has nothing",    cache.has("foo"), false);
-			ensure_equals("gets nothing",   cache.get("foo", 0), std::string() );
-			U32 max_time = 0xFFFFFFFF;
-			ensure_equals("erases nothing", cache.eraseBefore(max_time), 0);
-		}
+    // New empty cache shouldn't have any entries
+    template<> template<>
+        void LLTimestampCacheTestObject::test<2>()
+        {
+            LLTimestampCache<std::string, std::string> cache;
+            ensure_equals("starts empty",   cache.size(), 0);
+            ensure_equals("has nothing",    cache.has("foo"), false);
+            ensure_equals("gets nothing",   cache.get("foo", 0), std::string() );
+            U32 max_time = 0xFFFFFFFF;
+            ensure_equals("erases nothing", cache.eraseBefore(max_time), 0);
+        }
 
-	// Non empty cache
-	template<> template<>
-		void LLTimestampCacheTestObject::test<3>()
-		{
-			LLTimestampCache<std::string, std::string> cache;
-			cache.insert("foo", "bar", 123);
-			ensure_equals("size one", cache.size(), 1);
-			ensure_equals("has it", cache.has("foo"), true);
-			ensure_equals("timestamp correct", cache.getTimestamp("foo"), 123);
-			std::string value = cache.get("foo", 456);
-			ensure_equals("get value", value, "bar");
-			ensure_equals("timestamp updated", cache.getTimestamp("foo"), 456);
-			ensure_equals("erase nothing", cache.eraseBefore(0), 0);
-			ensure_equals("erase one", cache.eraseBefore(789), 1);
-			ensure_equals("empty after erase", cache.size(), 0);
-		}
+    // Non empty cache
+    template<> template<>
+        void LLTimestampCacheTestObject::test<3>()
+        {
+            LLTimestampCache<std::string, std::string> cache;
+            cache.insert("foo", "bar", 123);
+            ensure_equals("size one", cache.size(), 1);
+            ensure_equals("has it", cache.has("foo"), true);
+            ensure_equals("timestamp correct", cache.getTimestamp("foo"), 123);
+            std::string value = cache.get("foo", 456);
+            ensure_equals("get value", value, "bar");
+            ensure_equals("timestamp updated", cache.getTimestamp("foo"), 456);
+            ensure_equals("erase nothing", cache.eraseBefore(0), 0);
+            ensure_equals("erase one", cache.eraseBefore(789), 1);
+            ensure_equals("empty after erase", cache.size(), 0);
+        }
 
-	// Recache of item should update timestamp
-	template<> template<>
-		void LLTimestampCacheTestObject::test<4>()
-		{
-			LLTimestampCache<std::string, std::string> cache;
-			cache.insert("foo", "bar", 123);
-			cache.insert("foo", "bar", 456);
-			ensure_equals("duplicate suppressed", cache.size(), 1);
-			ensure_equals("timestamp replaced", cache.getTimestamp("foo"), 456);
-		}
+    // Recache of item should update timestamp
+    template<> template<>
+        void LLTimestampCacheTestObject::test<4>()
+        {
+            LLTimestampCache<std::string, std::string> cache;
+            cache.insert("foo", "bar", 123);
+            cache.insert("foo", "bar", 456);
+            ensure_equals("duplicate suppressed", cache.size(), 1);
+            ensure_equals("timestamp replaced", cache.getTimestamp("foo"), 456);
+        }
 
-	// Erasing some items
-	template<> template<>
-		void LLTimestampCacheTestObject::test<5>()
-		{
-			LLTimestampCache<std::string, std::string> cache;
-			cache.insert("key1", "val1", 1);
-			cache.insert("key2", "val2", 2);
-			cache.insert("key3", "val3", 3);
-			cache.insert("key4", "val4", 4);
-			size_t erased = cache.eraseBefore(3);
-			ensure_equals("erase range", erased, 2);
-			ensure_equals("cache post erase", cache.size(), 2);
-			ensure_equals("has key3", cache.has("key3"), true);
-			ensure_equals("not has key2", cache.has("key2"), false);
-		}
+    // Erasing some items
+    template<> template<>
+        void LLTimestampCacheTestObject::test<5>()
+        {
+            LLTimestampCache<std::string, std::string> cache;
+            cache.insert("key1", "val1", 1);
+            cache.insert("key2", "val2", 2);
+            cache.insert("key3", "val3", 3);
+            cache.insert("key4", "val4", 4);
+            size_t erased = cache.eraseBefore(3);
+            ensure_equals("erase range", erased, 2);
+            ensure_equals("cache post erase", cache.size(), 2);
+            ensure_equals("has key3", cache.has("key3"), true);
+            ensure_equals("not has key2", cache.has("key2"), false);
+        }
 }