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/newview/llpanelimcontrolpanel.h b/indra/newview/llpanelimcontrolpanel.h
index 02915ec4bb..c7f5263bec 100644
--- a/indra/newview/llpanelimcontrolpanel.h
+++ b/indra/newview/llpanelimcontrolpanel.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llpanelimcontrolpanel.h
  * @brief LLPanelIMControlPanel and related class definitions
  *
  * $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$
  */
@@ -33,51 +33,51 @@
 class LLParticipantList;
 
 class LLPanelChatControlPanel
-	: public LLPanel
+    : public LLPanel
 {
 public:
-	LLPanelChatControlPanel() :
-		mSessionId(LLUUID()) {};
-	~LLPanelChatControlPanel();
+    LLPanelChatControlPanel() :
+        mSessionId(LLUUID()) {};
+    ~LLPanelChatControlPanel();
 
-	virtual BOOL postBuild();
+    virtual BOOL postBuild();
 
-	virtual void setSessionId(const LLUUID& session_id);
-	const LLUUID& getSessionId() { return mSessionId; }
+    virtual void setSessionId(const LLUUID& session_id);
+    const LLUUID& getSessionId() { return mSessionId; }
 
 private:
-	LLUUID mSessionId;
+    LLUUID mSessionId;
 
-	// connection to voice channel state change signal
-	boost::signals2::connection mVoiceChannelStateChangeConnection;
+    // connection to voice channel state change signal
+    boost::signals2::connection mVoiceChannelStateChangeConnection;
 };
 
 class LLPanelGroupControlPanel : public LLPanelChatControlPanel
 {
 public:
-	LLPanelGroupControlPanel(const LLUUID& session_id);
-	~LLPanelGroupControlPanel();
+    LLPanelGroupControlPanel(const LLUUID& session_id);
+    ~LLPanelGroupControlPanel();
 
-	BOOL postBuild();
+    BOOL postBuild();
 
-	void setSessionId(const LLUUID& session_id);
-	/*virtual*/ void draw();
+    void setSessionId(const LLUUID& session_id);
+    /*virtual*/ void draw();
 
 protected:
-	LLUUID mGroupID;
+    LLUUID mGroupID;
 
-	LLParticipantList* mParticipantList;
+    LLParticipantList* mParticipantList;
 
 private:
-	void onSortMenuItemClicked(const LLSD& userdata);
+    void onSortMenuItemClicked(const LLSD& userdata);
 };
 
 class LLPanelAdHocControlPanel : public LLPanelGroupControlPanel
 {
 public:
-	LLPanelAdHocControlPanel(const LLUUID& session_id);
+    LLPanelAdHocControlPanel(const LLUUID& session_id);
 
-	BOOL postBuild();
+    BOOL postBuild();
 
 };