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

diff --git a/indra/newview/llnamelistctrl.h b/indra/newview/llnamelistctrl.h
index 4a4bd4ba09..111b8d1077 100644
--- a/indra/newview/llnamelistctrl.h
+++ b/indra/newview/llnamelistctrl.h
@@ -42,143 +42,143 @@ class LLAvatarName;
 class LLNameListItem : public LLScrollListItem, public LLHandleProvider<LLNameListItem>
 {
 public:
-	bool isGroup() const { return mIsGroup; }
-	void setIsGroup(bool is_group) { mIsGroup = is_group; }
-	bool isExperience() const { return mIsExperience; }
-	void setIsExperience(bool is_experience) { mIsExperience = is_experience; }
+    bool isGroup() const { return mIsGroup; }
+    void setIsGroup(bool is_group) { mIsGroup = is_group; }
+    bool isExperience() const { return mIsExperience; }
+    void setIsExperience(bool is_experience) { mIsExperience = is_experience; }
     void setSpecialID(const LLUUID& special_id) { mSpecialID = special_id; }
     const LLUUID& getSpecialID() const { return mSpecialID; }
 
 protected:
-	friend class LLNameListCtrl;
+    friend class LLNameListCtrl;
 
-	LLNameListItem( const LLScrollListItem::Params& p )
-	:	LLScrollListItem(p), mIsGroup(false), mIsExperience(false)
-	{
-	}
+    LLNameListItem( const LLScrollListItem::Params& p )
+    :   LLScrollListItem(p), mIsGroup(false), mIsExperience(false)
+    {
+    }
 
-	LLNameListItem( const LLScrollListItem::Params& p, bool is_group )
-	:	LLScrollListItem(p), mIsGroup(is_group), mIsExperience(false)
-	{
-	}
+    LLNameListItem( const LLScrollListItem::Params& p, bool is_group )
+    :   LLScrollListItem(p), mIsGroup(is_group), mIsExperience(false)
+    {
+    }
 
-	LLNameListItem( const LLScrollListItem::Params& p, bool is_group, bool is_experience )
-	:	LLScrollListItem(p), mIsGroup(is_group), mIsExperience(is_experience)
-	{
-	}
+    LLNameListItem( const LLScrollListItem::Params& p, bool is_group, bool is_experience )
+    :   LLScrollListItem(p), mIsGroup(is_group), mIsExperience(is_experience)
+    {
+    }
 
 private:
-	bool mIsGroup;
-	bool mIsExperience;
+    bool mIsGroup;
+    bool mIsExperience;
 
     LLUUID mSpecialID;
 };
 
 
 class LLNameListCtrl
-:	public LLScrollListCtrl, public LLInstanceTracker<LLNameListCtrl>
+:   public LLScrollListCtrl, public LLInstanceTracker<LLNameListCtrl>
 {
 public:
-	typedef boost::signals2::signal<void(bool)> namelist_complete_signal_t;
-
-	typedef enum e_name_type
-	{
-		INDIVIDUAL,
-		GROUP,
-		SPECIAL,
-		EXPERIENCE
-	} ENameType;
-
-	// provide names for enums
-	struct NameTypeNames : public LLInitParam::TypeValuesHelper<LLNameListCtrl::ENameType, NameTypeNames>
-	{
-		static void declareValues();
-	};
-
-	struct NameItem : public LLInitParam::Block<NameItem, LLScrollListItem::Params>
-	{
-		Optional<std::string>				name;
-		Optional<ENameType, NameTypeNames>	target;
+    typedef boost::signals2::signal<void(bool)> namelist_complete_signal_t;
+
+    typedef enum e_name_type
+    {
+        INDIVIDUAL,
+        GROUP,
+        SPECIAL,
+        EXPERIENCE
+    } ENameType;
+
+    // provide names for enums
+    struct NameTypeNames : public LLInitParam::TypeValuesHelper<LLNameListCtrl::ENameType, NameTypeNames>
+    {
+        static void declareValues();
+    };
+
+    struct NameItem : public LLInitParam::Block<NameItem, LLScrollListItem::Params>
+    {
+        Optional<std::string>               name;
+        Optional<ENameType, NameTypeNames>  target;
         Optional<LLUUID>                    special_id;
 
-		NameItem()
-		:	name("name"),
-			target("target", INDIVIDUAL),
+        NameItem()
+        :   name("name"),
+            target("target", INDIVIDUAL),
             special_id("special_id", LLUUID())
-		{}
-	};
-
-	struct NameColumn : public LLInitParam::ChoiceBlock<NameColumn>
-	{
-		Alternative<S32>				column_index;
-		Alternative<std::string>		column_name;
-		NameColumn()
-		:	column_name("name_column"),
-			column_index("name_column_index", 0)
-		{}
-	};
-
-	struct Params : public LLInitParam::Block<Params, LLScrollListCtrl::Params>
-	{
-		Optional<NameColumn>	name_column;
-		Optional<bool>	allow_calling_card_drop;
-		Optional<bool>			short_names;
-		Params();
-	};
+        {}
+    };
+
+    struct NameColumn : public LLInitParam::ChoiceBlock<NameColumn>
+    {
+        Alternative<S32>                column_index;
+        Alternative<std::string>        column_name;
+        NameColumn()
+        :   column_name("name_column"),
+            column_index("name_column_index", 0)
+        {}
+    };
+
+    struct Params : public LLInitParam::Block<Params, LLScrollListCtrl::Params>
+    {
+        Optional<NameColumn>    name_column;
+        Optional<bool>  allow_calling_card_drop;
+        Optional<bool>          short_names;
+        Params();
+    };
 
 protected:
-	LLNameListCtrl(const Params&);
-	virtual ~LLNameListCtrl()
-	{
-		for (avatar_name_cache_connection_map_t::iterator it = mAvatarNameCacheConnections.begin(); it != mAvatarNameCacheConnections.end(); ++it)
-		{
-			if (it->second.connected())
-			{
-				it->second.disconnect();
-			}
-		}
-		mAvatarNameCacheConnections.clear();
-	}
-	friend class LLUICtrlFactory;
+    LLNameListCtrl(const Params&);
+    virtual ~LLNameListCtrl()
+    {
+        for (avatar_name_cache_connection_map_t::iterator it = mAvatarNameCacheConnections.begin(); it != mAvatarNameCacheConnections.end(); ++it)
+        {
+            if (it->second.connected())
+            {
+                it->second.disconnect();
+            }
+        }
+        mAvatarNameCacheConnections.clear();
+    }
+    friend class LLUICtrlFactory;
 public:
-	// Add a user to the list by name.  It will be added, the name
-	// requested from the cache, and updated as necessary.
-	LLScrollListItem* addNameItem(const LLUUID& agent_id, EAddPosition pos = ADD_BOTTOM,
-					 BOOL enabled = TRUE, const std::string& suffix = LLStringUtil::null, const std::string& prefix = LLStringUtil::null);
-	LLScrollListItem* addNameItem(NameItem& item, EAddPosition pos = ADD_BOTTOM);
+    // Add a user to the list by name.  It will be added, the name
+    // requested from the cache, and updated as necessary.
+    LLScrollListItem* addNameItem(const LLUUID& agent_id, EAddPosition pos = ADD_BOTTOM,
+                     BOOL enabled = TRUE, const std::string& suffix = LLStringUtil::null, const std::string& prefix = LLStringUtil::null);
+    LLScrollListItem* addNameItem(NameItem& item, EAddPosition pos = ADD_BOTTOM);
 
-	/*virtual*/ LLScrollListItem* addElement(const LLSD& element, EAddPosition pos = ADD_BOTTOM, void* userdata = NULL);
-	LLScrollListItem* addNameItemRow(const NameItem& value, EAddPosition pos = ADD_BOTTOM, const std::string& suffix = LLStringUtil::null,
-																							const std::string& prefix = LLStringUtil::null);
+    /*virtual*/ LLScrollListItem* addElement(const LLSD& element, EAddPosition pos = ADD_BOTTOM, void* userdata = NULL);
+    LLScrollListItem* addNameItemRow(const NameItem& value, EAddPosition pos = ADD_BOTTOM, const std::string& suffix = LLStringUtil::null,
+                                                                                            const std::string& prefix = LLStringUtil::null);
 
-	// Add a user to the list by name.  It will be added, the name
-	// requested from the cache, and updated as necessary.
-	void addGroupNameItem(const LLUUID& group_id, EAddPosition pos = ADD_BOTTOM,
-						  BOOL enabled = TRUE);
-	void addGroupNameItem(NameItem& item, EAddPosition pos = ADD_BOTTOM);
+    // Add a user to the list by name.  It will be added, the name
+    // requested from the cache, and updated as necessary.
+    void addGroupNameItem(const LLUUID& group_id, EAddPosition pos = ADD_BOTTOM,
+                          BOOL enabled = TRUE);
+    void addGroupNameItem(NameItem& item, EAddPosition pos = ADD_BOTTOM);
 
 
-	void removeNameItem(const LLUUID& agent_id);
+    void removeNameItem(const LLUUID& agent_id);
 
-	LLScrollListItem* getNameItemByAgentId(const LLUUID& agent_id);
+    LLScrollListItem* getNameItemByAgentId(const LLUUID& agent_id);
 
     void selectItemBySpecialId(const LLUUID& special_id);
     LLUUID getSelectedSpecialId();
 
-	// LLView interface
-	/*virtual*/ BOOL	handleDragAndDrop(S32 x, S32 y, MASK mask,
-									  BOOL drop, EDragAndDropType cargo_type, void *cargo_data,
-									  EAcceptance *accept,
-									  std::string& tooltip_msg);
-	/*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask);
+    // LLView interface
+    /*virtual*/ BOOL    handleDragAndDrop(S32 x, S32 y, MASK mask,
+                                      BOOL drop, EDragAndDropType cargo_type, void *cargo_data,
+                                      EAcceptance *accept,
+                                      std::string& tooltip_msg);
+    /*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask);
 
-	void setAllowCallingCardDrop(BOOL b) { mAllowCallingCardDrop = b; }
+    void setAllowCallingCardDrop(BOOL b) { mAllowCallingCardDrop = b; }
 
-	void sortByName(BOOL ascending);
+    void sortByName(BOOL ascending);
 
-	/*virtual*/ void updateColumns(bool force_update);
+    /*virtual*/ void updateColumns(bool force_update);
 
-	/*virtual*/ void mouseOverHighlightNthItem( S32 index );
+    /*virtual*/ void mouseOverHighlightNthItem( S32 index );
 
     /*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
 
@@ -188,36 +188,36 @@ public:
     void setHoverIconName(std::string icon_name) { mHoverIconName = icon_name; }
 
 private:
-	void showInspector(const LLUUID& avatar_id, bool is_group, bool is_experience = false);
-	void onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name, std::string suffix, std::string prefix, LLHandle<LLNameListItem> item);
-	void onGroupNameCache(const LLUUID& group_id, const std::string name, LLHandle<LLNameListItem> item);
+    void showInspector(const LLUUID& avatar_id, bool is_group, bool is_experience = false);
+    void onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name, std::string suffix, std::string prefix, LLHandle<LLNameListItem> item);
+    void onGroupNameCache(const LLUUID& group_id, const std::string name, LLHandle<LLNameListItem> item);
 
 private:
-	S32    			mNameColumnIndex;
-	std::string		mNameColumn;
-	BOOL			mAllowCallingCardDrop;
-	bool			mShortNames;  // display name only, no SLID
-	typedef std::map<LLUUID, boost::signals2::connection> avatar_name_cache_connection_map_t;
-	avatar_name_cache_connection_map_t mAvatarNameCacheConnections;
-	avatar_name_cache_connection_map_t mGroupNameCacheConnections;
+    S32             mNameColumnIndex;
+    std::string     mNameColumn;
+    BOOL            mAllowCallingCardDrop;
+    bool            mShortNames;  // display name only, no SLID
+    typedef std::map<LLUUID, boost::signals2::connection> avatar_name_cache_connection_map_t;
+    avatar_name_cache_connection_map_t mAvatarNameCacheConnections;
+    avatar_name_cache_connection_map_t mGroupNameCacheConnections;
 
-	S32 mPendingLookupsRemaining;
-	namelist_complete_signal_t mNameListCompleteSignal;
+    S32 mPendingLookupsRemaining;
+    namelist_complete_signal_t mNameListCompleteSignal;
 
     std::string     mHoverIconName;
     e_name_type     mNameListType;
 
     boost::signals2::signal<void(const LLUUID &)> mIconClickedSignal;
-	
+
 public:
-	boost::signals2::connection setOnNameListCompleteCallback(boost::function<void(bool)> onNameListCompleteCallback) 
-	{ 
-		return mNameListCompleteSignal.connect(onNameListCompleteCallback); 
-	}
-
-    boost::signals2::connection setIconClickedCallback(boost::function<void(const LLUUID &)> cb) 
-    { 
-        return mIconClickedSignal.connect(cb); 
+    boost::signals2::connection setOnNameListCompleteCallback(boost::function<void(bool)> onNameListCompleteCallback)
+    {
+        return mNameListCompleteSignal.connect(onNameListCompleteCallback);
+    }
+
+    boost::signals2::connection setIconClickedCallback(boost::function<void(const LLUUID &)> cb)
+    {
+        return mIconClickedSignal.connect(cb);
     }
 };