merge

1 files changed, 11 insertions, 1 deletions

diff --git a/indra/newview/llpathfindingnavmesh.h b/indra/newview/llpathfindingnavmesh.h
index eb9ef9683d..46a114439a 100644
--- a/indra/newview/llpathfindingnavmesh.h
+++ b/indra/newview/llpathfindingnavmesh.h
@@ -42,11 +42,15 @@ class LLPathfindingNavMesh;
 

 typedef boost::shared_ptr<LLPathfindingNavMesh> LLPathfindingNavMeshPtr;

 

+// XXX stinson 03/12/2012 : This definition is in place to support an older version of the pathfinding simulator that does not have versioned information

+#define DEPRECATED_UNVERSIONED_NAVMESH

+

 class LLPathfindingNavMesh

 {

 public:

 	typedef enum {

 		kNavMeshRequestUnknown,

+		kNavMeshRequestChecking,

 		kNavMeshRequestNeedsUpdate,

 		kNavMeshRequestStarted,

 		kNavMeshRequestCompleted,

@@ -63,13 +67,19 @@ public:
 

 	navmesh_slot_t registerNavMeshListener(navmesh_callback_t pNavMeshCallback);

 

+#ifdef DEPRECATED_UNVERSIONED_NAVMESH

+	U32  getNavMeshVersion() const {return mNavMeshVersion;};

+#endif // DEPRECATED_UNVERSIONED_NAVMESH

+

 	bool hasNavMeshVersion(U32 pNavMeshVersion) const;

 

-	void handleRefresh();

+	void handleNavMeshCheckVersion();

+	void handleRefresh(U32 pNavMeshVersion);

 	void handleNavMeshNewVersion(U32 pNavMeshVersion);

 	void handleNavMeshStart(U32 pNavMeshVersion);

 	void handleNavMeshResult(const LLSD &pContent, U32 pNavMeshVersion);

 	void handleNavMeshNotEnabled();

+	void handleNavMeshError();

 	void handleNavMeshError(U32 pStatus, const std::string &pReason, const std::string &pURL, U32 pNavMeshVersion);

 

 protected: