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

diff --git a/indra/llwindow/lldragdropwin32.h b/indra/llwindow/lldragdropwin32.h
index 4673242cba..1b30dced27 100644
--- a/indra/llwindow/lldragdropwin32.h
+++ b/indra/llwindow/lldragdropwin32.h
@@ -5,21 +5,21 @@
  * $LicenseInfo:firstyear=2004&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,16 +36,16 @@
 
 class LLDragDropWin32
 {
-	public:
-		LLDragDropWin32();
-		~LLDragDropWin32();
+    public:
+        LLDragDropWin32();
+        ~LLDragDropWin32();
 
-		bool init( HWND hWnd );
-		void reset();
+        bool init( HWND hWnd );
+        void reset();
 
-	private:
-		IDropTarget* mDropTarget;
-		HWND mDropWindowHandle;
+    private:
+        IDropTarget* mDropTarget;
+        HWND mDropWindowHandle;
 };
 #endif // LL_LLDRAGDROP32_H
 
@@ -57,15 +57,15 @@ class LLDragDropWin32
 #include "llwin32headerslean.h"
 #include <ole2.h>
 
-// impostor class that does nothing 
+// impostor class that does nothing
 class LLDragDropWin32
 {
-	public:
-		LLDragDropWin32() {};
-		~LLDragDropWin32() {};
+    public:
+        LLDragDropWin32() {};
+        ~LLDragDropWin32() {};
 
-		bool init( HWND hWnd ) { return false; };
-		void reset() { };
+        bool init( HWND hWnd ) { return false; };
+        void reset() { };
 };
 #endif // LL_LLDRAGDROP32_H