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

diff --git a/indra/newview/llpathfindingnavmeshstatus.h b/indra/newview/llpathfindingnavmeshstatus.h
index 74533fa484..e429d13a3f 100644
--- a/indra/newview/llpathfindingnavmeshstatus.h
+++ b/indra/newview/llpathfindingnavmeshstatus.h
@@ -1,4 +1,4 @@
-/** 
+/**
 * @file   llpathfindingnavmeshstatus.h
 * @brief  Header file for llpathfindingnavmeshstatus
 * @author Stinson@lindenlab.com
@@ -36,42 +36,42 @@ class LLSD;
 class LLPathfindingNavMeshStatus
 {
 public:
-	typedef enum
-	{
-		kPending,
-		kBuilding,
-		kComplete,
-		kRepending
-	} ENavMeshStatus;
+    typedef enum
+    {
+        kPending,
+        kBuilding,
+        kComplete,
+        kRepending
+    } ENavMeshStatus;
 
-	LLPathfindingNavMeshStatus();
-	LLPathfindingNavMeshStatus(const LLUUID &pRegionUUID);
-	LLPathfindingNavMeshStatus(const LLUUID &pRegionUUID, const LLSD &pContent);
-	LLPathfindingNavMeshStatus(const LLSD &pContent);
-	LLPathfindingNavMeshStatus(const LLPathfindingNavMeshStatus &pOther);
-	virtual ~LLPathfindingNavMeshStatus();
+    LLPathfindingNavMeshStatus();
+    LLPathfindingNavMeshStatus(const LLUUID &pRegionUUID);
+    LLPathfindingNavMeshStatus(const LLUUID &pRegionUUID, const LLSD &pContent);
+    LLPathfindingNavMeshStatus(const LLSD &pContent);
+    LLPathfindingNavMeshStatus(const LLPathfindingNavMeshStatus &pOther);
+    virtual ~LLPathfindingNavMeshStatus();
 
-	LLPathfindingNavMeshStatus &operator =(const LLPathfindingNavMeshStatus &pOther);
+    LLPathfindingNavMeshStatus &operator =(const LLPathfindingNavMeshStatus &pOther);
 
-	bool           isValid() const        {return mIsValid;};
-	const LLUUID   &getRegionUUID() const {return mRegionUUID;};
-	U32            getVersion() const     {return mVersion;};
-	ENavMeshStatus getStatus() const      {return mStatus;};
+    bool           isValid() const        {return mIsValid;};
+    const LLUUID   &getRegionUUID() const {return mRegionUUID;};
+    U32            getVersion() const     {return mVersion;};
+    ENavMeshStatus getStatus() const      {return mStatus;};
 
 protected:
 
 private:
-	void           parseStatus(const LLSD &pContent);
+    void           parseStatus(const LLSD &pContent);
 
-	bool           mIsValid;
-	LLUUID         mRegionUUID;
-	U32            mVersion;
-	ENavMeshStatus mStatus;
+    bool           mIsValid;
+    LLUUID         mRegionUUID;
+    U32            mVersion;
+    ENavMeshStatus mStatus;
 
-	static const std::string sStatusPending;
-	static const std::string sStatusBuilding;
-	static const std::string sStatusComplete;
-	static const std::string sStatusRepending;
+    static const std::string sStatusPending;
+    static const std::string sStatusBuilding;
+    static const std::string sStatusComplete;
+    static const std::string sStatusRepending;
 };
 
 #endif // LL_LLPATHFINDINGNAVMESHSTATUS_H