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

diff --git a/indra/newview/llsidepaneltaskinfo.h b/indra/newview/llsidepaneltaskinfo.h
index 2baafc67e7..ea457cebe5 100644
--- a/indra/newview/llsidepaneltaskinfo.h
+++ b/indra/newview/llsidepaneltaskinfo.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llsidepaneltaskinfo.h
  * @brief LLSidepanelTaskInfo class header file
  *
  * $LicenseInfo:firstyear=2002&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$
  */
@@ -46,116 +46,116 @@ class LLTextBase;
 class LLSidepanelTaskInfo : public LLPanel
 {
 public:
-	LLSidepanelTaskInfo();
-	virtual ~LLSidepanelTaskInfo();
+    LLSidepanelTaskInfo();
+    virtual ~LLSidepanelTaskInfo();
 
-	BOOL postBuild() override;
-	void onVisibilityChange ( BOOL new_visibility ) override;
+    BOOL postBuild() override;
+    void onVisibilityChange ( BOOL new_visibility ) override;
 
-	void setObjectSelection(LLObjectSelectionHandle selection);
+    void setObjectSelection(LLObjectSelectionHandle selection);
 
-	const LLUUID& getSelectedUUID();
-	LLViewerObject* getFirstSelectedObject();
+    const LLUUID& getSelectedUUID();
+    LLViewerObject* getFirstSelectedObject();
 
-	static LLSidepanelTaskInfo *getActivePanel();
+    static LLSidepanelTaskInfo *getActivePanel();
     void dirty();
     static void onIdle( void* user_data );
 protected:
-	void refresh() override;	// refresh all labels as needed
-	void save();
-	void updateVerbs();
+    void refresh() override;    // refresh all labels as needed
+    void save();
+    void updateVerbs();
 
-	void refreshAll(); // ignore current keyboard focus and update all fields
+    void refreshAll(); // ignore current keyboard focus and update all fields
 
-	// statics
-	static void onClickClaim(void*);
-	static void onClickRelease(void*);
-		   void onClickGroup();
-		   void cbGroupID(LLUUID group_id);
-	static void onClickDeedToGroup(void*);
+    // statics
+    static void onClickClaim(void*);
+    static void onClickRelease(void*);
+           void onClickGroup();
+           void cbGroupID(LLUUID group_id);
+    static void onClickDeedToGroup(void*);
 
-	static void onCommitPerm(LLUICtrl *ctrl, void *data, U8 field, U32 perm);
+    static void onCommitPerm(LLUICtrl *ctrl, void *data, U8 field, U32 perm);
 
-	static void onCommitGroupShare(LLUICtrl *ctrl, void *data);
+    static void onCommitGroupShare(LLUICtrl *ctrl, void *data);
 
-	static void onCommitEveryoneMove(LLUICtrl *ctrl, void *data);
-	static void onCommitEveryoneCopy(LLUICtrl *ctrl, void *data);
+    static void onCommitEveryoneMove(LLUICtrl *ctrl, void *data);
+    static void onCommitEveryoneCopy(LLUICtrl *ctrl, void *data);
 
-	static void onCommitNextOwnerModify(LLUICtrl* ctrl, void* data);
-	static void onCommitNextOwnerCopy(LLUICtrl* ctrl, void* data);
-	static void onCommitNextOwnerTransfer(LLUICtrl* ctrl, void* data);
-	
-	static void onCommitName(LLUICtrl* ctrl, void* data);
-	static void onCommitDesc(LLUICtrl* ctrl, void* data);
+    static void onCommitNextOwnerModify(LLUICtrl* ctrl, void* data);
+    static void onCommitNextOwnerCopy(LLUICtrl* ctrl, void* data);
+    static void onCommitNextOwnerTransfer(LLUICtrl* ctrl, void* data);
 
-	static void onCommitSaleInfo(LLUICtrl* ctrl, void* data);
-	static void onCommitSaleType(LLUICtrl* ctrl, void* data);	
-	void setAllSaleInfo();
+    static void onCommitName(LLUICtrl* ctrl, void* data);
+    static void onCommitDesc(LLUICtrl* ctrl, void* data);
 
-	static void	onCommitClickAction(LLUICtrl* ctrl, void* data);
-	static void onCommitIncludeInSearch(LLUICtrl* ctrl, void*);
+    static void onCommitSaleInfo(LLUICtrl* ctrl, void* data);
+    static void onCommitSaleType(LLUICtrl* ctrl, void* data);
+    void setAllSaleInfo();
 
-	static void	doClickAction(U8 click_action);
-	void disableAll();
-	void disablePermissions();
+    static void onCommitClickAction(LLUICtrl* ctrl, void* data);
+    static void onCommitIncludeInSearch(LLUICtrl* ctrl, void*);
+
+    static void doClickAction(U8 click_action);
+    void disableAll();
+    void disablePermissions();
 
 private:
-	LLNameBox*		mLabelGroupName;		// group name
+    LLNameBox*      mLabelGroupName;        // group name
+
+    LLUUID          mCreatorID;
+    LLUUID          mOwnerID;
+    LLUUID          mLastOwnerID;
 
-	LLUUID			mCreatorID;
-	LLUUID			mOwnerID;
-	LLUUID			mLastOwnerID;
-    
     bool mIsDirty;
 
 protected:
-	void 						onOpenButtonClicked();
-	void 						onPayButtonClicked();
-	void 						onBuyButtonClicked();
-	void 						onDetailsButtonClicked();
+    void                        onOpenButtonClicked();
+    void                        onPayButtonClicked();
+    void                        onBuyButtonClicked();
+    void                        onDetailsButtonClicked();
 private:
-	LLButton*					mOpenBtn;
-	LLButton*					mPayBtn;
-	LLButton*					mBuyBtn;
-	LLButton*					mDetailsBtn;
-	LLButton*					mDeedBtn;
+    LLButton*                   mOpenBtn;
+    LLButton*                   mPayBtn;
+    LLButton*                   mBuyBtn;
+    LLButton*                   mDetailsBtn;
+    LLButton*                   mDeedBtn;
 
 protected:
-	LLViewerObject*				getObject();
+    LLViewerObject*             getObject();
 private:
-	LLPointer<LLViewerObject>	mObject;
-	LLObjectSelectionHandle		mObjectSelection;
+    LLPointer<LLViewerObject>   mObject;
+    LLObjectSelectionHandle     mObjectSelection;
 
     // mVisibleDebugPermissions doesn't nessesarily matche state
     // of viewes and is primarily for floater resize
     bool                        mVisibleDebugPermissions;
-	static LLSidepanelTaskInfo* sActivePanel;
-	
+    static LLSidepanelTaskInfo* sActivePanel;
+
 private:
-	// Pointers cached here to speed up the "disableAll" function which gets called on idle
-	LLUICtrl*	mDAPermModify;
-	LLUICtrl*	mDACreatorName;
-	LLView*		mDAOwner;
-	LLUICtrl*	mDAOwnerName;
-	LLView*		mDAButtonSetGroup;
-	LLUICtrl*	mDAObjectName;
-	LLView*		mDAName;
-	LLView*		mDADescription;
-	LLUICtrl*	mDAObjectDescription;
-	LLUICtrl*	mDACheckboxShareWithGroup;
-	LLView*		mDAButtonDeed;
-	LLUICtrl*	mDACheckboxAllowEveryoneMove;
-	LLUICtrl*	mDACheckboxAllowEveryoneCopy;
-	LLUICtrl*	mDACheckboxNextOwnerCanModify;
-	LLUICtrl*	mDACheckboxNextOwnerCanCopy;
-	LLUICtrl*	mDACheckboxNextOwnerCanTransfer;
-	LLUICtrl*	mDACheckboxForSale;
-	LLUICtrl*	mDASearchCheck;
-	LLComboBox*	mDAComboSaleType;
-	LLUICtrl*	mDAEditCost;
-	LLView*		mDALabelClickAction;
-	LLComboBox*	mDAComboClickAction;
-	LLTextBase* mDAPathfindingAttributes;
+    // Pointers cached here to speed up the "disableAll" function which gets called on idle
+    LLUICtrl*   mDAPermModify;
+    LLUICtrl*   mDACreatorName;
+    LLView*     mDAOwner;
+    LLUICtrl*   mDAOwnerName;
+    LLView*     mDAButtonSetGroup;
+    LLUICtrl*   mDAObjectName;
+    LLView*     mDAName;
+    LLView*     mDADescription;
+    LLUICtrl*   mDAObjectDescription;
+    LLUICtrl*   mDACheckboxShareWithGroup;
+    LLView*     mDAButtonDeed;
+    LLUICtrl*   mDACheckboxAllowEveryoneMove;
+    LLUICtrl*   mDACheckboxAllowEveryoneCopy;
+    LLUICtrl*   mDACheckboxNextOwnerCanModify;
+    LLUICtrl*   mDACheckboxNextOwnerCanCopy;
+    LLUICtrl*   mDACheckboxNextOwnerCanTransfer;
+    LLUICtrl*   mDACheckboxForSale;
+    LLUICtrl*   mDASearchCheck;
+    LLComboBox* mDAComboSaleType;
+    LLUICtrl*   mDAEditCost;
+    LLView*     mDALabelClickAction;
+    LLComboBox* mDAComboClickAction;
+    LLTextBase* mDAPathfindingAttributes;
     LLUICtrl*   mDAB;
     LLUICtrl*   mDAO;
     LLUICtrl*   mDAG;