Merge branch 'main' into marchcat/x-b-merge

# Conflicts:
#	autobuild.xml
#	indra/cmake/ConfigurePkgConfig.cmake
#	indra/cmake/ICU4C.cmake
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
#	indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
#	indra/newview/llappviewerlinux_api.h
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llappviewerlinux_api_dbus.h
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/lloutfitslist.cpp

1 files changed, 200 insertions, 200 deletions

diff --git a/indra/test/llmessageconfig_tut.cpp b/indra/test/llmessageconfig_tut.cpp
index df2151b1b1..93443467a2 100644
--- a/indra/test/llmessageconfig_tut.cpp
+++ b/indra/test/llmessageconfig_tut.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llmessageconfig_tut.cpp
  * @date   March 2007
  * @brief LLMessageConfig unit tests
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2006&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$
  */
@@ -36,201 +36,201 @@
 
 namespace tut
 {
-	struct LLMessageConfigTestData {
-		std::string mTestConfigDir;
-
-		LLMessageConfigTestData()
-		{
-			LLUUID random;
-			random.generate();
-			// generate temp dir
-			std::ostringstream oStr;
-#if LL_WINDOWS 
-			oStr << "llmessage-config-test-" << random;
+    struct LLMessageConfigTestData {
+        std::string mTestConfigDir;
+
+        LLMessageConfigTestData()
+        {
+            LLUUID random;
+            random.generate();
+            // generate temp dir
+            std::ostringstream oStr;
+#if LL_WINDOWS
+            oStr << "llmessage-config-test-" << random;
 #else
-			oStr << "/tmp/llmessage-config-test-" << random;
+            oStr << "/tmp/llmessage-config-test-" << random;
 #endif
-			mTestConfigDir = oStr.str();
-			LLFile::mkdir(mTestConfigDir);
-			writeConfigFile(LLSD());
-			LLMessageConfig::initClass("simulator", mTestConfigDir);
-		}
-
-		~LLMessageConfigTestData()
-		{
-			// rm contents of temp dir
-			int rmfile = LLFile::remove((mTestConfigDir + "/message.xml"));
-			ensure_equals("rmfile value", rmfile, 0);
-			// rm temp dir
-			int rmdir = LLFile::rmdir(mTestConfigDir);
-			ensure_equals("rmdir value", rmdir, 0);
-		}
-
-		void writeConfigFile(const LLSD& config)
-		{
-			llofstream file((mTestConfigDir + "/message.xml").c_str());
-			if (file.is_open())
-			{
-				LLSDSerialize::toPrettyXML(config, file);
-			}
-			file.close();
-		}
-	};
-	
-	typedef test_group<LLMessageConfigTestData> LLMessageConfigTestGroup;
-	typedef LLMessageConfigTestGroup::object LLMessageConfigTestObject;
-	LLMessageConfigTestGroup llMessageConfigTestGroup("LLMessageConfig");
-	
-	template<> template<>
-	void LLMessageConfigTestObject::test<1>()
-		// tests server defaults
-	{
-		LLSD config;
-		config["serverDefaults"]["simulator"] = "template";
-		LLMessageConfig::useConfig(config);
-		ensure_equals("Ensure server default is not template",
-					  LLMessageConfig::getServerDefaultFlavor(),
-					  LLMessageConfig::TEMPLATE_FLAVOR);
-	}
-
-	template<> template<>
-	void LLMessageConfigTestObject::test<2>()
-		// tests message flavors
-	{
-		LLSD config;
-		config["serverDefaults"]["simulator"] = "template";
-		config["messages"]["msg1"]["flavor"] = "template";
-		config["messages"]["msg2"]["flavor"] = "llsd";
-		LLMessageConfig::useConfig(config);
-		ensure_equals("Ensure msg template flavor",
-					  LLMessageConfig::getMessageFlavor("msg1"),
-					  LLMessageConfig::TEMPLATE_FLAVOR);
-		ensure_equals("Ensure msg llsd flavor",
-					  LLMessageConfig::getMessageFlavor("msg2"),
-					  LLMessageConfig::LLSD_FLAVOR);
-	}
-
-	template<> template<>
-	void LLMessageConfigTestObject::test<4>()
-		// tests message flavor defaults
-	{
-		LLSD config;
-		config["serverDefaults"]["simulator"] = "llsd";
-		config["messages"]["msg1"]["trusted-sender"] = true;
-		LLMessageConfig::useConfig(config);
-		ensure_equals("Ensure missing message gives no flavor",
-					  LLMessageConfig::getMessageFlavor("Test"),
-					  LLMessageConfig::NO_FLAVOR);
-		ensure_equals("Ensure missing flavor is NO_FLAVOR even with sender trustedness set",
-					  LLMessageConfig::getMessageFlavor("msg1"),
-					  LLMessageConfig::NO_FLAVOR);
-		ensure_equals("Ensure server default is llsd",
-					  LLMessageConfig::getServerDefaultFlavor(),
-					  LLMessageConfig::LLSD_FLAVOR);
-	}
-
-	template<> template<>
-	void LLMessageConfigTestObject::test<3>()
-		// tests trusted/untrusted senders
-	{
-		LLSD config;
-		config["serverDefaults"]["simulator"] = "template";
-		config["messages"]["msg1"]["flavor"] = "llsd";
-		config["messages"]["msg1"]["trusted-sender"] = false;
-		config["messages"]["msg2"]["flavor"] = "llsd";
-		config["messages"]["msg2"]["trusted-sender"] = true;
-		LLMessageConfig::useConfig(config);
-		ensure_equals("Ensure untrusted is untrusted",
-					  LLMessageConfig::getSenderTrustedness("msg1"),
-					  LLMessageConfig::UNTRUSTED);
-		ensure_equals("Ensure trusted is trusted",
-					  LLMessageConfig::getSenderTrustedness("msg2"),
-					  LLMessageConfig::TRUSTED);
-		ensure_equals("Ensure missing trustedness is NOT_SET",
-					  LLMessageConfig::getSenderTrustedness("msg3"),
-					  LLMessageConfig::NOT_SET);
-	}
-	
-	template<> template<>
-	void LLMessageConfigTestObject::test<5>()
-		// tests trusted/untrusted without flag, only flavor
-	{
-		LLSD config;
-		config["serverDefaults"]["simulator"] = "template";
-		config["messages"]["msg1"]["flavor"] = "llsd";
-		LLMessageConfig::useConfig(config);
-		ensure_equals("Ensure msg1 exists, has llsd flavor",
-					  LLMessageConfig::getMessageFlavor("msg1"),
-					  LLMessageConfig::LLSD_FLAVOR);
-		ensure_equals("Ensure missing trusted is not set",
-					  LLMessageConfig::getSenderTrustedness("msg1"),
-					  LLMessageConfig::NOT_SET);
-	}
-
-	template<> template<>
-	void LLMessageConfigTestObject::test<6>()
-	{
-		LLSD config;
-		config["capBans"]["MapLayer"] = true;
-		config["capBans"]["MapLayerGod"] = false;
-		LLMessageConfig::useConfig(config);
-		ensure_equals("Ensure cap ban true MapLayer",
-					  LLMessageConfig::isCapBanned("MapLayer"),
-					  true);
-		ensure_equals("Ensure cap ban false",
-					  LLMessageConfig::isCapBanned("MapLayerGod"),
-					  false);
-	}
-
-	template<> template<>
-	void LLMessageConfigTestObject::test<7>()
-		// tests that config changes are picked up/refreshed periodically
-	{
-		LLSD config;
-		config["serverDefaults"]["simulator"] = "llsd";
-		writeConfigFile(config);
-
-		// wait for it to reload after N seconds
-		ms_sleep(6*1000);
-		LLFrameTimer::updateFrameTime();
-		ensure_equals("Ensure reload after 6 seconds",
-					  LLMessageConfig::getServerDefaultFlavor(),
-					  LLMessageConfig::LLSD_FLAVOR);
-	}
-
-	template<> template<>
-	void LLMessageConfigTestObject::test<8>()
-		// tests that config changes are picked up/refreshed periodically
-	{
-		LLSD config;
-		config["serverDefaults"]["simulator"] = "template";
-		config["messages"]["msg1"]["flavor"] = "llsd";
-		config["messages"]["msg1"]["only-send-latest"] = true;
-		config["messages"]["msg2"]["flavor"] = "llsd";
-		config["messages"]["msg2"]["only-send-latest"] = false;
-		LLMessageConfig::useConfig(config);
-		ensure_equals("Ensure msg1 exists, sent latest-only",
-					  LLMessageConfig::onlySendLatest("msg1"),
-					  true);
-		ensure_equals("Ensure msg2 exists, sent latest-only",
-					  LLMessageConfig::onlySendLatest("msg2"),
-					  false);
-	}
-
-	template<> template<>
-	void LLMessageConfigTestObject::test<9>()
-		 // tests that event queue max is reloaded
-	{
-		LLSD config;
-		config["maxQueuedEvents"] = 200;
-		LLMessageConfig::useConfig(config);
-		ensure_equals("Ensure setting maxQueuedEvents",
-					  LLMessageConfig::getMaxQueuedEvents(),
-					  200);
-
-		LLMessageConfig::useConfig(LLSD());
-		ensure_equals("Ensure default of event queue max 100",
-					  LLMessageConfig::getMaxQueuedEvents(),
-					  100);
-	}	 
+            mTestConfigDir = oStr.str();
+            LLFile::mkdir(mTestConfigDir);
+            writeConfigFile(LLSD());
+            LLMessageConfig::initClass("simulator", mTestConfigDir);
+        }
+
+        ~LLMessageConfigTestData()
+        {
+            // rm contents of temp dir
+            int rmfile = LLFile::remove((mTestConfigDir + "/message.xml"));
+            ensure_equals("rmfile value", rmfile, 0);
+            // rm temp dir
+            int rmdir = LLFile::rmdir(mTestConfigDir);
+            ensure_equals("rmdir value", rmdir, 0);
+        }
+
+        void writeConfigFile(const LLSD& config)
+        {
+            llofstream file((mTestConfigDir + "/message.xml").c_str());
+            if (file.is_open())
+            {
+                LLSDSerialize::toPrettyXML(config, file);
+            }
+            file.close();
+        }
+    };
+
+    typedef test_group<LLMessageConfigTestData> LLMessageConfigTestGroup;
+    typedef LLMessageConfigTestGroup::object LLMessageConfigTestObject;
+    LLMessageConfigTestGroup llMessageConfigTestGroup("LLMessageConfig");
+
+    template<> template<>
+    void LLMessageConfigTestObject::test<1>()
+        // tests server defaults
+    {
+        LLSD config;
+        config["serverDefaults"]["simulator"] = "template";
+        LLMessageConfig::useConfig(config);
+        ensure_equals("Ensure server default is not template",
+                      LLMessageConfig::getServerDefaultFlavor(),
+                      LLMessageConfig::TEMPLATE_FLAVOR);
+    }
+
+    template<> template<>
+    void LLMessageConfigTestObject::test<2>()
+        // tests message flavors
+    {
+        LLSD config;
+        config["serverDefaults"]["simulator"] = "template";
+        config["messages"]["msg1"]["flavor"] = "template";
+        config["messages"]["msg2"]["flavor"] = "llsd";
+        LLMessageConfig::useConfig(config);
+        ensure_equals("Ensure msg template flavor",
+                      LLMessageConfig::getMessageFlavor("msg1"),
+                      LLMessageConfig::TEMPLATE_FLAVOR);
+        ensure_equals("Ensure msg llsd flavor",
+                      LLMessageConfig::getMessageFlavor("msg2"),
+                      LLMessageConfig::LLSD_FLAVOR);
+    }
+
+    template<> template<>
+    void LLMessageConfigTestObject::test<4>()
+        // tests message flavor defaults
+    {
+        LLSD config;
+        config["serverDefaults"]["simulator"] = "llsd";
+        config["messages"]["msg1"]["trusted-sender"] = true;
+        LLMessageConfig::useConfig(config);
+        ensure_equals("Ensure missing message gives no flavor",
+                      LLMessageConfig::getMessageFlavor("Test"),
+                      LLMessageConfig::NO_FLAVOR);
+        ensure_equals("Ensure missing flavor is NO_FLAVOR even with sender trustedness set",
+                      LLMessageConfig::getMessageFlavor("msg1"),
+                      LLMessageConfig::NO_FLAVOR);
+        ensure_equals("Ensure server default is llsd",
+                      LLMessageConfig::getServerDefaultFlavor(),
+                      LLMessageConfig::LLSD_FLAVOR);
+    }
+
+    template<> template<>
+    void LLMessageConfigTestObject::test<3>()
+        // tests trusted/untrusted senders
+    {
+        LLSD config;
+        config["serverDefaults"]["simulator"] = "template";
+        config["messages"]["msg1"]["flavor"] = "llsd";
+        config["messages"]["msg1"]["trusted-sender"] = false;
+        config["messages"]["msg2"]["flavor"] = "llsd";
+        config["messages"]["msg2"]["trusted-sender"] = true;
+        LLMessageConfig::useConfig(config);
+        ensure_equals("Ensure untrusted is untrusted",
+                      LLMessageConfig::getSenderTrustedness("msg1"),
+                      LLMessageConfig::UNTRUSTED);
+        ensure_equals("Ensure trusted is trusted",
+                      LLMessageConfig::getSenderTrustedness("msg2"),
+                      LLMessageConfig::TRUSTED);
+        ensure_equals("Ensure missing trustedness is NOT_SET",
+                      LLMessageConfig::getSenderTrustedness("msg3"),
+                      LLMessageConfig::NOT_SET);
+    }
+
+    template<> template<>
+    void LLMessageConfigTestObject::test<5>()
+        // tests trusted/untrusted without flag, only flavor
+    {
+        LLSD config;
+        config["serverDefaults"]["simulator"] = "template";
+        config["messages"]["msg1"]["flavor"] = "llsd";
+        LLMessageConfig::useConfig(config);
+        ensure_equals("Ensure msg1 exists, has llsd flavor",
+                      LLMessageConfig::getMessageFlavor("msg1"),
+                      LLMessageConfig::LLSD_FLAVOR);
+        ensure_equals("Ensure missing trusted is not set",
+                      LLMessageConfig::getSenderTrustedness("msg1"),
+                      LLMessageConfig::NOT_SET);
+    }
+
+    template<> template<>
+    void LLMessageConfigTestObject::test<6>()
+    {
+        LLSD config;
+        config["capBans"]["MapLayer"] = true;
+        config["capBans"]["MapLayerGod"] = false;
+        LLMessageConfig::useConfig(config);
+        ensure_equals("Ensure cap ban true MapLayer",
+                      LLMessageConfig::isCapBanned("MapLayer"),
+                      true);
+        ensure_equals("Ensure cap ban false",
+                      LLMessageConfig::isCapBanned("MapLayerGod"),
+                      false);
+    }
+
+    template<> template<>
+    void LLMessageConfigTestObject::test<7>()
+        // tests that config changes are picked up/refreshed periodically
+    {
+        LLSD config;
+        config["serverDefaults"]["simulator"] = "llsd";
+        writeConfigFile(config);
+
+        // wait for it to reload after N seconds
+        ms_sleep(6*1000);
+        LLFrameTimer::updateFrameTime();
+        ensure_equals("Ensure reload after 6 seconds",
+                      LLMessageConfig::getServerDefaultFlavor(),
+                      LLMessageConfig::LLSD_FLAVOR);
+    }
+
+    template<> template<>
+    void LLMessageConfigTestObject::test<8>()
+        // tests that config changes are picked up/refreshed periodically
+    {
+        LLSD config;
+        config["serverDefaults"]["simulator"] = "template";
+        config["messages"]["msg1"]["flavor"] = "llsd";
+        config["messages"]["msg1"]["only-send-latest"] = true;
+        config["messages"]["msg2"]["flavor"] = "llsd";
+        config["messages"]["msg2"]["only-send-latest"] = false;
+        LLMessageConfig::useConfig(config);
+        ensure_equals("Ensure msg1 exists, sent latest-only",
+                      LLMessageConfig::onlySendLatest("msg1"),
+                      true);
+        ensure_equals("Ensure msg2 exists, sent latest-only",
+                      LLMessageConfig::onlySendLatest("msg2"),
+                      false);
+    }
+
+    template<> template<>
+    void LLMessageConfigTestObject::test<9>()
+         // tests that event queue max is reloaded
+    {
+        LLSD config;
+        config["maxQueuedEvents"] = 200;
+        LLMessageConfig::useConfig(config);
+        ensure_equals("Ensure setting maxQueuedEvents",
+                      LLMessageConfig::getMaxQueuedEvents(),
+                      200);
+
+        LLMessageConfig::useConfig(LLSD());
+        ensure_equals("Ensure default of event queue max 100",
+                      LLMessageConfig::getMaxQueuedEvents(),
+                      100);
+    }
 }