diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-01-18 16:55:15 -0800 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-01-18 16:55:15 -0800 |
| commit | f88a8f6f46d9b4e9e628a910e941787d327adf5d (patch) | |
| tree | 9b3c87d5ad1ea8d2db3d0dbbe43779e779f4b12e /indra/newview | |
| parent | fe18dda3df1c5061ac0b956bfebc261c45467738 (diff) | |
PATH-226: Implementing a check for the multiple names of the ObjectNavMeshProperties service until the new service name is fully deployed.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterpathfindinglinksets.cpp | 18 | ||||
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llviewerregion.h | 3 |
3 files changed, 23 insertions, 1 deletions
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 |