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

diff --git a/indra/newview/llfloaterscriptlimits.h b/indra/newview/llfloaterscriptlimits.h
index d2192f9d01..8c5bdb99cd 100644
--- a/indra/newview/llfloaterscriptlimits.h
+++ b/indra/newview/llfloaterscriptlimits.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llfloaterscriptlimits.h
  * @author Gabriel Lee
  * @brief Declaration of the region info and controls floater and panels.
@@ -6,21 +6,21 @@
  * $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$
  */
@@ -44,24 +44,24 @@ class LLPanelScriptLimitsRegionMemory;
 
 class LLFloaterScriptLimits : public LLFloater
 {
-	friend class LLFloaterReg;
+    friend class LLFloaterReg;
 public:
 
-	/*virtual*/ BOOL postBuild();
+    /*virtual*/ BOOL postBuild();
 
-	// from LLPanel
-	virtual void refresh();
+    // from LLPanel
+    virtual void refresh();
 
 private:
 
-	LLFloaterScriptLimits(const LLSD& seed);
-	~LLFloaterScriptLimits();
+    LLFloaterScriptLimits(const LLSD& seed);
+    ~LLFloaterScriptLimits();
 
 protected:
 
-	LLTabContainer* mTab;
-	typedef std::vector<LLPanelScriptLimitsInfo*> info_panels_t;
-	info_panels_t mInfoPanels;
+    LLTabContainer* mTab;
+    typedef std::vector<LLPanelScriptLimitsInfo*> info_panels_t;
+    info_panels_t mInfoPanels;
 };
 
 
@@ -69,17 +69,17 @@ protected:
 class LLPanelScriptLimitsInfo : public LLPanel
 {
 public:
-	LLPanelScriptLimitsInfo();
-	
-	virtual BOOL postBuild();
-	virtual void updateChild(LLUICtrl* child_ctrl);
-	
+    LLPanelScriptLimitsInfo();
+
+    virtual BOOL postBuild();
+    virtual void updateChild(LLUICtrl* child_ctrl);
+
 protected:
-	void initCtrl(const std::string& name);
-	
-	typedef std::vector<std::string> strings_t;
-	
-	LLHost mHost;
+    void initCtrl(const std::string& name);
+
+    typedef std::vector<std::string> strings_t;
+
+    LLHost mHost;
 };
 
 /////////////////////////////////////////////////////////////////////////////
@@ -88,53 +88,53 @@ protected:
 
 class LLPanelScriptLimitsRegionMemory : public LLPanelScriptLimitsInfo, LLRemoteParcelInfoObserver
 {
-	
+
 public:
-	LLPanelScriptLimitsRegionMemory()
-		: LLPanelScriptLimitsInfo(), LLRemoteParcelInfoObserver(),
+    LLPanelScriptLimitsRegionMemory()
+        : LLPanelScriptLimitsInfo(), LLRemoteParcelInfoObserver(),
 
-		mParcelId(LLUUID()),
-		mGotParcelMemoryUsed(false),
-		mGotParcelMemoryMax(false),
-		mParcelMemoryMax(0),
-		mParcelMemoryUsed(0) {};
+        mParcelId(LLUUID()),
+        mGotParcelMemoryUsed(false),
+        mGotParcelMemoryMax(false),
+        mParcelMemoryMax(0),
+        mParcelMemoryUsed(0) {};
 
-	~LLPanelScriptLimitsRegionMemory();
-	
-	// LLPanel
-	virtual BOOL postBuild();
+    ~LLPanelScriptLimitsRegionMemory();
 
-	void setRegionDetails(LLSD content);
-	void setRegionSummary(LLSD content);
+    // LLPanel
+    virtual BOOL postBuild();
 
-	BOOL StartRequestChain();
+    void setRegionDetails(LLSD content);
+    void setRegionSummary(LLSD content);
 
-	BOOL getLandScriptResources();
-	void clearList();
-	void showBeacon();
-	void returnObjectsFromParcel(S32 local_id);
-	void returnObjects();
-	void checkButtonsEnabled();
+    BOOL StartRequestChain();
+
+    BOOL getLandScriptResources();
+    void clearList();
+    void showBeacon();
+    void returnObjectsFromParcel(S32 local_id);
+    void returnObjects();
+    void checkButtonsEnabled();
 
 private:
-	void onAvatarNameCache(const LLUUID& id,
-						 const LLAvatarName& av_name);
-	void onNameCache(const LLUUID& id,
-						 const std::string& name);
+    void onAvatarNameCache(const LLUUID& id,
+                         const LLAvatarName& av_name);
+    void onNameCache(const LLUUID& id,
+                         const std::string& name);
 
-	LLSD mContent;
-	LLUUID mParcelId;
-	bool mGotParcelMemoryUsed;
-	bool mGotParcelMemoryMax;
-	S32 mParcelMemoryMax;
-	S32 mParcelMemoryUsed;
+    LLSD mContent;
+    LLUUID mParcelId;
+    bool mGotParcelMemoryUsed;
+    bool mGotParcelMemoryMax;
+    S32 mParcelMemoryMax;
+    S32 mParcelMemoryUsed;
 
-	bool mGotParcelURLsUsed;
-	bool mGotParcelURLsMax;
-	S32 mParcelURLsMax;
-	S32 mParcelURLsUsed;
+    bool mGotParcelURLsUsed;
+    bool mGotParcelURLsMax;
+    S32 mParcelURLsMax;
+    S32 mParcelURLsUsed;
 
-	std::vector<LLSD> mObjectListItems;
+    std::vector<LLSD> mObjectListItems;
 
     void getLandScriptResourcesCoro(std::string url);
     void getLandScriptSummaryCoro(std::string url);
@@ -146,10 +146,10 @@ protected:
 /*virtual*/ void processParcelInfo(const LLParcelData& parcel_data);
 /*virtual*/ void setParcelID(const LLUUID& parcel_id);
 /*virtual*/ void setErrorStatus(S32 status, const std::string& reason);
-	
-	static void onClickRefresh(void* userdata);
-	static void onClickHighlight(void* userdata);
-	static void onClickReturn(void* userdata);
+
+    static void onClickRefresh(void* userdata);
+    static void onClickHighlight(void* userdata);
+    static void onClickReturn(void* userdata);
 };
 
 #endif