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

diff --git a/indra/newview/tests/lltextureinfodetails_test.cpp b/indra/newview/tests/lltextureinfodetails_test.cpp
index 31ec5f9d4e..58cab03c50 100644
--- a/indra/newview/tests/lltextureinfodetails_test.cpp
+++ b/indra/newview/tests/lltextureinfodetails_test.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llwtextureinfodetails_test.cpp
  * @author Si & Gabriel
  * @date 2009-03-30
@@ -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,7 +36,7 @@
 
 // -------------------------------------------------------------------------------------------
 // Stubbing: Declarations required to link and run the class being tested
-// Notes: 
+// Notes:
 // * Add here stubbed implementation of the few classes and methods used in the class to be tested
 // * Add as little as possible (let the link errors guide you)
 // * Do not make any assumption as to how those classes or methods work (i.e. don't copy/paste code)
@@ -52,41 +52,41 @@
 
 namespace tut
 {
-	// Test wrapper declarations
-	struct textureinfodetails_test
-	{
-		// Constructor and destructor of the test wrapper
-		textureinfodetails_test()
-		{
-		}
-		~textureinfodetails_test()
-		{
-		}
-	};
+    // Test wrapper declarations
+    struct textureinfodetails_test
+    {
+        // Constructor and destructor of the test wrapper
+        textureinfodetails_test()
+        {
+        }
+        ~textureinfodetails_test()
+        {
+        }
+    };
+
+    // Tut templating thingamagic: test group, object and test instance
+    typedef test_group<textureinfodetails_test> textureinfodetails_t;
+    typedef textureinfodetails_t::object textureinfodetails_object_t;
+    tut::textureinfodetails_t tut_textureinfodetails("LLTextureInfoDetails");
 
-	// Tut templating thingamagic: test group, object and test instance
-	typedef test_group<textureinfodetails_test> textureinfodetails_t;
-	typedef textureinfodetails_t::object textureinfodetails_object_t;
-	tut::textureinfodetails_t tut_textureinfodetails("LLTextureInfoDetails");
 
-	
-	// ---------------------------------------------------------------------------------------
-	// Test functions
-	// Notes:
-	// * Test as many as you possibly can without requiring a full blown simulation of everything
-	// * The tests are executed in sequence so the test instance state may change between calls
-	// * Remember that you cannot test private methods with tut
-	// ---------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------
+    // Test functions
+    // Notes:
+    // * Test as many as you possibly can without requiring a full blown simulation of everything
+    // * The tests are executed in sequence so the test instance state may change between calls
+    // * Remember that you cannot test private methods with tut
+    // ---------------------------------------------------------------------------------------
 
-	// ---------------------------------------------------------------------------------------
-	// Test the LLTextureInfo
-	// ---------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------
+    // Test the LLTextureInfo
+    // ---------------------------------------------------------------------------------------
 
 
-	// Test instantiation
-	template<> template<>
-	void textureinfodetails_object_t::test<1>()
-	{
-		ensure("have we crashed?", true);
-	}
+    // Test instantiation
+    template<> template<>
+    void textureinfodetails_object_t::test<1>()
+    {
+        ensure("have we crashed?", true);
+    }
 }