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/llfloaterpathfindinglinksets.cpp | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llfloaterpathfindinglinksets.cpp')

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)
-- 
cgit v1.2.3