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

diff --git a/indra/llwindow/llkeyboardheadless.h b/indra/llwindow/llkeyboardheadless.h
index 79c276fdbb..595f824872 100644
--- a/indra/llwindow/llkeyboardheadless.h
+++ b/indra/llwindow/llkeyboardheadless.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llkeyboardheadless.h
  * @brief Handler for assignable key bindings
  *
  * $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$
  */
@@ -32,21 +32,21 @@
 class LLKeyboardHeadless : public LLKeyboard
 {
 public:
-	LLKeyboardHeadless();
-	/*virtual*/ ~LLKeyboardHeadless() {};
+    LLKeyboardHeadless();
+    /*virtual*/ ~LLKeyboardHeadless() {};
 
 #ifndef LL_SDL
-	/*virtual*/ BOOL	handleKeyUp(const U16 key, MASK mask) { return FALSE; }
-	/*virtual*/ BOOL	handleKeyDown(const U16 key, MASK mask) { return FALSE; }
+    /*virtual*/ BOOL    handleKeyUp(const U16 key, MASK mask) { return FALSE; }
+    /*virtual*/ BOOL    handleKeyDown(const U16 key, MASK mask) { return FALSE; }
 #else
-    /*virtual*/ BOOL	handleKeyUp(const U32 key, MASK mask) { return FALSE; }
-    /*virtual*/ BOOL	handleKeyDown(const U32 key, MASK mask) { return FALSE; }
+    /*virtual*/ BOOL    handleKeyUp(const U32 key, MASK mask) { return FALSE; }
+    /*virtual*/ BOOL    handleKeyDown(const U32 key, MASK mask) { return FALSE; }
 #endif
-	/*virtual*/ void	resetMaskKeys();
-	/*virtual*/ MASK	currentMask(BOOL for_mouse_event);
-	/*virtual*/ void	scanKeyboard();
+    /*virtual*/ void    resetMaskKeys();
+    /*virtual*/ MASK    currentMask(BOOL for_mouse_event);
+    /*virtual*/ void    scanKeyboard();
 #ifdef LL_DARWIN
-	/*virtual*/ void	handleModifier(MASK mask);
+    /*virtual*/ void    handleModifier(MASK mask);
 #endif
 };