diff --git a/indra/newview/llfloaterpathfindinglinksets.cpp b/indra/newview/llfloaterpathfindinglinksets.cpp
index 16711190cd..60c5365ade 100644
--- a/indra/newview/llfloaterpathfindinglinksets.cpp
+++ b/indra/newview/llfloaterpathfindinglinksets.cpp
@@ -769,15 +769,31 @@ std::string LLFloaterPathfindingLinksets::getRegionName() const
 
 std::string LLFloaterPathfindingLinksets::getCapabilityURL() const
 {
+#ifdef XXX_STINSON_REGION_CAP_RENAME
 	std::string navmeshDataURL("");
 
 	LLViewerRegion* region = gAgent.getRegion();
 	if (region != NULL)
 	{
-		navmeshDataURL = region->getCapability("ObjectNavmesh");
+		navmeshDataURL = region->getCapability("ObjectNavMeshProperties");
+		if (navmeshDataURL.empty())
+		{
+			navmeshDataURL = region->getCapability("ObjectNavmesh");
+		}
 	}
 
 	return navmeshDataURL;
+#else // XXX_STINSON_REGION_CAP_RENAME
+	std::string navmeshDataURL("");
+
+	LLViewerRegion* region = gAgent.getRegion();
+	if (region != NULL)
+	{
+		navmeshDataURL = region->getCapability("ObjectNavMeshProperties");
+	}
+
+	return navmeshDataURL;
+#endif // XXX_STINSON_REGION_CAP_RENAME
 }
 
 void LLFloaterPathfindingLinksets::setFetchState(EFetchState pFetchState)
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 18d23af971..978580498e 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1522,7 +1522,10 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 	capabilityNames.append("MeshUploadFlag");	
 	capabilityNames.append("NavMeshUpload");
 	capabilityNames.append("NewFileAgentInventory");
+#ifdef XXX_STINSON_REGION_CAP_RENAME
 	capabilityNames.append("ObjectNavmesh");
+#endif // XXX_STINSON_REGION_CAP_RENAME
+	capabilityNames.append("ObjectNavMeshProperties");
 	capabilityNames.append("ParcelPropertiesUpdate");
 	capabilityNames.append("ParcelMediaURLFilterList");
 	capabilityNames.append("ParcelNavigateMedia");
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