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

diff --git a/indra/llmessage/llmessagethrottle.h b/indra/llmessage/llmessagethrottle.h
index 4ea84f712a..8a96a6b589 100644
--- a/indra/llmessage/llmessagethrottle.h
+++ b/indra/llmessage/llmessagethrottle.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llmessagethrottle.h
  * @brief LLMessageThrottle class used for throttling messages.
  *
  * $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$
  */
@@ -34,43 +34,43 @@
 
 typedef enum e_message_throttle_categories
 {
-	MTC_VIEWER_ALERT,
-	MTC_AGENT_ALERT,
-	MTC_EOF
+    MTC_VIEWER_ALERT,
+    MTC_AGENT_ALERT,
+    MTC_EOF
 } EMessageThrottleCats;
 
 class LLMessageThrottleEntry
 {
 public:
-	LLMessageThrottleEntry(const size_t hash, const U64 entry_time)
-		: mHash(hash), mEntryTime(entry_time) {}
+    LLMessageThrottleEntry(const size_t hash, const U64 entry_time)
+        : mHash(hash), mEntryTime(entry_time) {}
 
-	size_t	getHash() const { return mHash; }
-	U64		getEntryTime() const { return mEntryTime; }
+    size_t  getHash() const { return mHash; }
+    U64     getEntryTime() const { return mEntryTime; }
 protected:
-	size_t	mHash;
-	U64		mEntryTime;
+    size_t  mHash;
+    U64     mEntryTime;
 };
 
 
 class LLMessageThrottle
 {
 public:
-	LLMessageThrottle();
-	~LLMessageThrottle();
+    LLMessageThrottle();
+    ~LLMessageThrottle();
 
-	BOOL addViewerAlert	(const LLUUID& to, const std::string& mesg);
-	BOOL addAgentAlert	(const LLUUID& agent, const LLUUID& task, const std::string& mesg);
+    BOOL addViewerAlert (const LLUUID& to, const std::string& mesg);
+    BOOL addAgentAlert  (const LLUUID& agent, const LLUUID& task, const std::string& mesg);
 
-	void pruneEntries();
+    void pruneEntries();
 
 protected:
-	typedef std::deque<LLMessageThrottleEntry>							message_list_t;
-	typedef std::deque<LLMessageThrottleEntry>::iterator				message_list_iterator_t;
-	typedef std::deque<LLMessageThrottleEntry>::reverse_iterator		message_list_reverse_iterator_t;
-	typedef std::deque<LLMessageThrottleEntry>::const_iterator			message_list_const_iterator_t;
-	typedef std::deque<LLMessageThrottleEntry>::const_reverse_iterator	message_list_const_reverse_iterator_t;
-	message_list_t	mMessageList[MTC_EOF];
+    typedef std::deque<LLMessageThrottleEntry>                          message_list_t;
+    typedef std::deque<LLMessageThrottleEntry>::iterator                message_list_iterator_t;
+    typedef std::deque<LLMessageThrottleEntry>::reverse_iterator        message_list_reverse_iterator_t;
+    typedef std::deque<LLMessageThrottleEntry>::const_iterator          message_list_const_iterator_t;
+    typedef std::deque<LLMessageThrottleEntry>::const_reverse_iterator  message_list_const_reverse_iterator_t;
+    message_list_t  mMessageList[MTC_EOF];
 };
 
 extern LLMessageThrottle gMessageThrottle;