From f88a8f6f46d9b4e9e628a910e941787d327adf5d Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 18 Jan 2012 16:55:15 -0800
Subject: PATH-226: Implementing a check for the multiple names of the
 ObjectNavMeshProperties service until the new service name is fully deployed.

---
 indra/newview/llviewerregion.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/llviewerregion.h')

diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index c483c6ef52..59b7234f43 100644
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -44,6 +44,9 @@
 #include "m4math.h"					// LLMatrix4
 #include "llhttpclient.h"
 
+// This definition is a reminder to remove the extra call to check for both capability names for the ObjectNavMeshProperties service
+#define XXX_STINSON_REGION_CAP_RENAME
+
 // Surface id's
 #define LAND  1
 #define WATER 2
-- 
cgit v1.2.3


From 1aa9408215d395122e1b79b8bced08d3dd9a3067 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 20 Jan 2012 15:54:20 -0800
Subject: PATH-226: Removing the extraneous checks for both the old and new CAP
 service names as the new server-side code has been fully deployed.

---
 indra/newview/llviewerregion.h | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'indra/newview/llviewerregion.h')

diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index 59b7234f43..c483c6ef52 100644
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -44,9 +44,6 @@
 #include "m4math.h"					// LLMatrix4
 #include "llhttpclient.h"
 
-// This definition is a reminder to remove the extra call to check for both capability names for the ObjectNavMeshProperties service
-#define XXX_STINSON_REGION_CAP_RENAME
-
 // Surface id's
 #define LAND  1
 #define WATER 2
-- 
cgit v1.2.3


From d4c0c127b62499b72745de7f9df135ec0286cc13 Mon Sep 17 00:00:00 2001
From: prep <none@none>
Date: Tue, 24 Jan 2012 16:09:26 -0500
Subject: WIP: path-118

---
 indra/newview/llviewerregion.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/llviewerregion.h')

diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index c483c6ef52..6004165b0e 100644
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -325,6 +325,7 @@ public:
 	bool objectsCrossParcel(const std::vector<LLBBox>& boxes) const;
 
 	void getNeighboringRegions( std::vector<LLViewerRegion*>& uniqueRegions );
+	void getNeighboringRegionsStatus( std::vector<S32>& regions );
 	
 public:
 	struct CompareDistance
-- 
cgit v1.2.3


From 2400b8a651e5aec599c2132d3cf9c12b78b21d83 Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Mon, 11 Jun 2012 17:46:39 -0400
Subject: WIP:path-703 Adding icon to slurl bar to indicate if dynamic
 pathfinding is enabled or disbled.

---
 indra/newview/llviewerregion.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/llviewerregion.h')

diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index 6004165b0e..7bf53ba542 100644
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -285,6 +285,9 @@ public:
 	void getSimulatorFeatures(LLSD& info);	
 	void setSimulatorFeatures(const LLSD& info);
 
+	
+	bool dynamicPathfindingEnabled() const;
+
 	typedef enum
 	{
 		CACHE_MISS_TYPE_FULL = 0,
-- 
cgit v1.2.3