Merge pull request #1478 from secondlife/marchcat/x-mf-merge

Maint X -> Materials Featurette merge

1 files changed, 77 insertions, 77 deletions

diff --git a/indra/newview/llpathfindingnavmeshzone.h b/indra/newview/llpathfindingnavmeshzone.h
index b76f4421a6..a2c8691391 100644
--- a/indra/newview/llpathfindingnavmeshzone.h
+++ b/indra/newview/llpathfindingnavmeshzone.h
@@ -1,4 +1,4 @@
-/** 
+/**
 * @file   llpathfindingnavmeshzone.h
 * @brief  Header file for llpathfindingnavmeshzone
 * @author Stinson@lindenlab.com
@@ -43,86 +43,86 @@ class LLViewerRegion;
 class LLPathfindingNavMeshZone
 {
 public:
-	typedef enum {
-		kNavMeshZoneRequestUnknown,
-		kNavMeshZoneRequestWaiting,
-		kNavMeshZoneRequestChecking,
-		kNavMeshZoneRequestNeedsUpdate,
-		kNavMeshZoneRequestStarted,
-		kNavMeshZoneRequestCompleted,
-		kNavMeshZoneRequestNotEnabled,
-		kNavMeshZoneRequestError
-	} ENavMeshZoneRequestStatus;
-
-	typedef enum {
-		kNavMeshZonePending,
-		kNavMeshZoneBuilding,
-		kNavMeshZoneSomePending,
-		kNavMeshZoneSomeBuilding,
-		kNavMeshZonePendingAndBuilding,
-		kNavMeshZoneComplete
-	} ENavMeshZoneStatus;
-
-	typedef boost::function<void (ENavMeshZoneRequestStatus)>         navmesh_zone_callback_t;
-	typedef boost::signals2::signal<void (ENavMeshZoneRequestStatus)> navmesh_zone_signal_t;
-	typedef boost::signals2::connection                               navmesh_zone_slot_t;
-
-	LLPathfindingNavMeshZone();
-	virtual ~LLPathfindingNavMeshZone();
-
-	navmesh_zone_slot_t registerNavMeshZoneListener(navmesh_zone_callback_t pNavMeshZoneCallback);
-	void initialize();
-
-	void enable();
-	void disable();
-	void refresh();
-
-	ENavMeshZoneStatus getNavMeshZoneStatus() const;
+    typedef enum {
+        kNavMeshZoneRequestUnknown,
+        kNavMeshZoneRequestWaiting,
+        kNavMeshZoneRequestChecking,
+        kNavMeshZoneRequestNeedsUpdate,
+        kNavMeshZoneRequestStarted,
+        kNavMeshZoneRequestCompleted,
+        kNavMeshZoneRequestNotEnabled,
+        kNavMeshZoneRequestError
+    } ENavMeshZoneRequestStatus;
+
+    typedef enum {
+        kNavMeshZonePending,
+        kNavMeshZoneBuilding,
+        kNavMeshZoneSomePending,
+        kNavMeshZoneSomeBuilding,
+        kNavMeshZonePendingAndBuilding,
+        kNavMeshZoneComplete
+    } ENavMeshZoneStatus;
+
+    typedef boost::function<void (ENavMeshZoneRequestStatus)>         navmesh_zone_callback_t;
+    typedef boost::signals2::signal<void (ENavMeshZoneRequestStatus)> navmesh_zone_signal_t;
+    typedef boost::signals2::connection                               navmesh_zone_slot_t;
+
+    LLPathfindingNavMeshZone();
+    virtual ~LLPathfindingNavMeshZone();
+
+    navmesh_zone_slot_t registerNavMeshZoneListener(navmesh_zone_callback_t pNavMeshZoneCallback);
+    void initialize();
+
+    void enable();
+    void disable();
+    void refresh();
+
+    ENavMeshZoneStatus getNavMeshZoneStatus() const;
 
 protected:
 
 private:
-	typedef boost::function<void (void)> navmesh_location_callback_t;
-	class NavMeshLocation
-	{
-	public:
-		NavMeshLocation(S32 pDirection, navmesh_location_callback_t pLocationCallback);
-		virtual ~NavMeshLocation();
-
-		void enable();
-		void refresh();
-		void disable();
-
-		LLPathfindingNavMesh::ENavMeshRequestStatus getRequestStatus() const;
-		LLPathfindingNavMeshStatus::ENavMeshStatus  getNavMeshStatus() const;
-
-	protected:
-
-	private:
-		void           handleNavMesh(LLPathfindingNavMesh::ENavMeshRequestStatus pNavMeshRequestStatus, const LLPathfindingNavMeshStatus &pNavMeshStatus, const LLSD::Binary &pNavMeshData);
-
-		void           clear();
-		LLViewerRegion *getRegion() const;
-
-		S32                                         mDirection;
-		LLUUID                                      mRegionUUID;
-		bool                                        mHasNavMesh;
-		U32                                         mNavMeshVersion;
-		LLPathfindingNavMeshStatus::ENavMeshStatus  mNavMeshStatus;
-		navmesh_location_callback_t                 mLocationCallback;
-		LLPathfindingNavMesh::ENavMeshRequestStatus mRequestStatus;
-		LLPathfindingNavMesh::navmesh_slot_t        mNavMeshSlot;
-	};
-
-	typedef std::shared_ptr<NavMeshLocation> NavMeshLocationPtr;
-	typedef std::vector<NavMeshLocationPtr> NavMeshLocationPtrs;
-
-	void handleNavMeshLocation();
-	void updateStatus();
-
-	NavMeshLocationPtrs       mNavMeshLocationPtrs;
-	ENavMeshZoneRequestStatus mNavMeshZoneRequestStatus;
-	navmesh_zone_signal_t     mNavMeshZoneSignal;
+    typedef boost::function<void (void)> navmesh_location_callback_t;
+    class NavMeshLocation
+    {
+    public:
+        NavMeshLocation(S32 pDirection, navmesh_location_callback_t pLocationCallback);
+        virtual ~NavMeshLocation();
+
+        void enable();
+        void refresh();
+        void disable();
+
+        LLPathfindingNavMesh::ENavMeshRequestStatus getRequestStatus() const;
+        LLPathfindingNavMeshStatus::ENavMeshStatus  getNavMeshStatus() const;
+
+    protected:
+
+    private:
+        void           handleNavMesh(LLPathfindingNavMesh::ENavMeshRequestStatus pNavMeshRequestStatus, const LLPathfindingNavMeshStatus &pNavMeshStatus, const LLSD::Binary &pNavMeshData);
+
+        void           clear();
+        LLViewerRegion *getRegion() const;
+
+        S32                                         mDirection;
+        LLUUID                                      mRegionUUID;
+        bool                                        mHasNavMesh;
+        U32                                         mNavMeshVersion;
+        LLPathfindingNavMeshStatus::ENavMeshStatus  mNavMeshStatus;
+        navmesh_location_callback_t                 mLocationCallback;
+        LLPathfindingNavMesh::ENavMeshRequestStatus mRequestStatus;
+        LLPathfindingNavMesh::navmesh_slot_t        mNavMeshSlot;
+    };
+
+    typedef std::shared_ptr<NavMeshLocation> NavMeshLocationPtr;
+    typedef std::vector<NavMeshLocationPtr> NavMeshLocationPtrs;
+
+    void handleNavMeshLocation();
+    void updateStatus();
+
+    NavMeshLocationPtrs       mNavMeshLocationPtrs;
+    ENavMeshZoneRequestStatus mNavMeshZoneRequestStatus;
+    navmesh_zone_signal_t     mNavMeshZoneSignal;
 };
 
 #endif // LL_LLPATHFINDINGNAVMESHZONE_H