livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PATH-226: Implementing a check for the multiple names of the ObjectNavMeshProperties service until the new service name is fully deployed.

meow-7.2.2
Todd Stinson 2012-01-18 16:55:15 -08:00
parent fe18dda3df
commit f88a8f6f46
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/llfloaterpathfindinglinksets.cpp
View File

@ -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)

3
indra/newview/llviewerregion.cpp
View File

@ -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");

3
indra/newview/llviewerregion.h
View File

@ -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