Merge pull request #1476 from secondlife/marchcat/x-b-merge

Maint X -> Maint B merge

1 files changed, 56 insertions, 56 deletions

diff --git a/indra/newview/llpathfindingmanager.h b/indra/newview/llpathfindingmanager.h
index 258d0fdef7..be03b161a0 100644
--- a/indra/newview/llpathfindingmanager.h
+++ b/indra/newview/llpathfindingmanager.h
@@ -1,4 +1,4 @@
-/** 
+/**
 * @file   llpathfindingmanager.h
 * @brief  Header file for llpathfindingmanager
 * @author Stinson@lindenlab.com
@@ -48,61 +48,61 @@ class LinksetsResponder;
 
 class LLPathfindingManager : public LLSingleton<LLPathfindingManager>
 {
-	LLSINGLETON(LLPathfindingManager);
-	virtual ~LLPathfindingManager();
+    LLSINGLETON(LLPathfindingManager);
+    virtual ~LLPathfindingManager();
 
-	friend class LLNavMeshSimStateChangeNode;
-	friend class NavMeshStatusResponder;
-	friend class LLAgentStateChangeNode;
-	friend class AgentStateResponder;
+    friend class LLNavMeshSimStateChangeNode;
+    friend class NavMeshStatusResponder;
+    friend class LLAgentStateChangeNode;
+    friend class AgentStateResponder;
 public:
-	typedef enum {
-		kRequestStarted,
-		kRequestCompleted,
-		kRequestNotEnabled,
-		kRequestError
-	} ERequestStatus;
+    typedef enum {
+        kRequestStarted,
+        kRequestCompleted,
+        kRequestNotEnabled,
+        kRequestError
+    } ERequestStatus;
 
-	void initSystem();
-	void quitSystem();
+    void initSystem();
+    void quitSystem();
 
-	bool isPathfindingViewEnabled() const;
-	bool isPathfindingEnabledForCurrentRegion() const;
-	bool isPathfindingEnabledForRegion(LLViewerRegion *pRegion) const;
+    bool isPathfindingViewEnabled() const;
+    bool isPathfindingEnabledForCurrentRegion() const;
+    bool isPathfindingEnabledForRegion(LLViewerRegion *pRegion) const;
 
-	bool isAllowViewTerrainProperties() const;
+    bool isAllowViewTerrainProperties() const;
 
-	LLPathfindingNavMesh::navmesh_slot_t registerNavMeshListenerForRegion(LLViewerRegion *pRegion, LLPathfindingNavMesh::navmesh_callback_t pNavMeshCallback);
-	void requestGetNavMeshForRegion(LLViewerRegion *pRegion, bool pIsGetStatusOnly);
+    LLPathfindingNavMesh::navmesh_slot_t registerNavMeshListenerForRegion(LLViewerRegion *pRegion, LLPathfindingNavMesh::navmesh_callback_t pNavMeshCallback);
+    void requestGetNavMeshForRegion(LLViewerRegion *pRegion, bool pIsGetStatusOnly);
 
-	typedef U32 request_id_t;
-	typedef boost::function<void (request_id_t, ERequestStatus, LLPathfindingObjectListPtr)> object_request_callback_t;
+    typedef U32 request_id_t;
+    typedef boost::function<void (request_id_t, ERequestStatus, LLPathfindingObjectListPtr)> object_request_callback_t;
 
-	void requestGetLinksets(request_id_t pRequestId, object_request_callback_t pLinksetsCallback) const;
-	void requestSetLinksets(request_id_t pRequestId, const LLPathfindingObjectListPtr &pLinksetListPtr, LLPathfindingLinkset::ELinksetUse pLinksetUse, S32 pA, S32 pB, S32 pC, S32 pD, object_request_callback_t pLinksetsCallback) const;
+    void requestGetLinksets(request_id_t pRequestId, object_request_callback_t pLinksetsCallback) const;
+    void requestSetLinksets(request_id_t pRequestId, const LLPathfindingObjectListPtr &pLinksetListPtr, LLPathfindingLinkset::ELinksetUse pLinksetUse, S32 pA, S32 pB, S32 pC, S32 pD, object_request_callback_t pLinksetsCallback) const;
 
-	void requestGetCharacters(request_id_t pRequestId, object_request_callback_t pCharactersCallback) const;
+    void requestGetCharacters(request_id_t pRequestId, object_request_callback_t pCharactersCallback) const;
 
-	typedef boost::function<void (BOOL)>         agent_state_callback_t;
-	typedef boost::signals2::signal<void (BOOL)> agent_state_signal_t;
-	typedef boost::signals2::connection          agent_state_slot_t;	
+    typedef boost::function<void (BOOL)>         agent_state_callback_t;
+    typedef boost::signals2::signal<void (BOOL)> agent_state_signal_t;
+    typedef boost::signals2::connection          agent_state_slot_t;
 
-	agent_state_slot_t registerAgentStateListener(agent_state_callback_t pAgentStateCallback);
-	void requestGetAgentState();	
+    agent_state_slot_t registerAgentStateListener(agent_state_callback_t pAgentStateCallback);
+    void requestGetAgentState();
 
-	typedef boost::function<void (bool)> rebake_navmesh_callback_t;
-	void requestRebakeNavMesh(rebake_navmesh_callback_t pRebakeNavMeshCallback);
+    typedef boost::function<void (bool)> rebake_navmesh_callback_t;
+    void requestRebakeNavMesh(rebake_navmesh_callback_t pRebakeNavMeshCallback);
 
 protected:
 
 private:
 
-	typedef std::map<LLUUID, LLPathfindingNavMeshPtr> NavMeshMap;
+    typedef std::map<LLUUID, LLPathfindingNavMeshPtr> NavMeshMap;
 
-	void handleDeferredGetAgentStateForRegion(const LLUUID &pRegionUUID);
-	void handleDeferredGetNavMeshForRegion(const LLUUID &pRegionUUID, bool pIsGetStatusOnly);
-	void handleDeferredGetLinksetsForRegion(const LLUUID &pRegionUUID, request_id_t pRequestId, object_request_callback_t pLinksetsCallback) const;
-	void handleDeferredGetCharactersForRegion(const LLUUID &pRegionUUID, request_id_t pRequestId, object_request_callback_t pCharactersCallback) const;
+    void handleDeferredGetAgentStateForRegion(const LLUUID &pRegionUUID);
+    void handleDeferredGetNavMeshForRegion(const LLUUID &pRegionUUID, bool pIsGetStatusOnly);
+    void handleDeferredGetLinksetsForRegion(const LLUUID &pRegionUUID, request_id_t pRequestId, object_request_callback_t pLinksetsCallback) const;
+    void handleDeferredGetCharactersForRegion(const LLUUID &pRegionUUID, request_id_t pRequestId, object_request_callback_t pCharactersCallback) const;
 
     void navMeshStatusRequestCoro(std::string url, U64 regionHandle, bool isGetStatusOnly);
     void navAgentStateRequestCoro(std::string url);
@@ -111,28 +111,28 @@ private:
     void linksetTerrainCoro(std::string url, std::shared_ptr<LinksetsResponder> linksetsResponsderPtr, LLSD putData) const;
     void charactersCoro(std::string url, request_id_t requestId, object_request_callback_t callback) const;
 
-	//void handleNavMeshStatusRequest(const LLPathfindingNavMeshStatus &pNavMeshStatus, LLViewerRegion *pRegion, bool pIsGetStatusOnly);
-	void handleNavMeshStatusUpdate(const LLPathfindingNavMeshStatus &pNavMeshStatus);
+    //void handleNavMeshStatusRequest(const LLPathfindingNavMeshStatus &pNavMeshStatus, LLViewerRegion *pRegion, bool pIsGetStatusOnly);
+    void handleNavMeshStatusUpdate(const LLPathfindingNavMeshStatus &pNavMeshStatus);
 
-	void handleAgentState(BOOL pCanRebakeRegion);
+    void handleAgentState(BOOL pCanRebakeRegion);
 
-	LLPathfindingNavMeshPtr getNavMeshForRegion(const LLUUID &pRegionUUID);
-	LLPathfindingNavMeshPtr getNavMeshForRegion(LLViewerRegion *pRegion);
+    LLPathfindingNavMeshPtr getNavMeshForRegion(const LLUUID &pRegionUUID);
+    LLPathfindingNavMeshPtr getNavMeshForRegion(LLViewerRegion *pRegion);
 
-	std::string getNavMeshStatusURLForCurrentRegion() const;
-	std::string getNavMeshStatusURLForRegion(LLViewerRegion *pRegion) const;
-	std::string getRetrieveNavMeshURLForRegion(LLViewerRegion *pRegion) const;
-	std::string getRetrieveObjectLinksetsURLForCurrentRegion() const;
+    std::string getNavMeshStatusURLForCurrentRegion() const;
+    std::string getNavMeshStatusURLForRegion(LLViewerRegion *pRegion) const;
+    std::string getRetrieveNavMeshURLForRegion(LLViewerRegion *pRegion) const;
+    std::string getRetrieveObjectLinksetsURLForCurrentRegion() const;
     std::string getChangeObjectLinksetsURLForCurrentRegion() const;
-	std::string getTerrainLinksetsURLForCurrentRegion() const;
-	std::string getCharactersURLForCurrentRegion() const;
-	std::string	getAgentStateURLForRegion(LLViewerRegion *pRegion) const;
-	std::string getCapabilityURLForCurrentRegion(const std::string &pCapabilityName) const;
-	std::string getCapabilityURLForRegion(LLViewerRegion *pRegion, const std::string &pCapabilityName) const;
-	LLViewerRegion *getCurrentRegion() const;
-
-	NavMeshMap           mNavMeshMap;
-	agent_state_signal_t mAgentStateSignal;
+    std::string getTerrainLinksetsURLForCurrentRegion() const;
+    std::string getCharactersURLForCurrentRegion() const;
+    std::string getAgentStateURLForRegion(LLViewerRegion *pRegion) const;
+    std::string getCapabilityURLForCurrentRegion(const std::string &pCapabilityName) const;
+    std::string getCapabilityURLForRegion(LLViewerRegion *pRegion, const std::string &pCapabilityName) const;
+    LLViewerRegion *getCurrentRegion() const;
+
+    NavMeshMap           mNavMeshMap;
+    agent_state_signal_t mAgentStateSignal;
 };
 
 #endif // LL_LLPATHFINDINGMANAGER_H