diff options
| -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, 1 insertions, 23 deletions
diff --git a/indra/newview/llfloaterpathfindinglinksets.cpp b/indra/newview/llfloaterpathfindinglinksets.cpp index 972e70f5d9..99465466e1 100644 --- a/indra/newview/llfloaterpathfindinglinksets.cpp +++ b/indra/newview/llfloaterpathfindinglinksets.cpp @@ -131,7 +131,7 @@ PathfindingLinkset::PathfindingLinkset(const std::string &pUUID, const LLSD& pNa mPathState = getPathState(isPermanent, isWalkable);
llassert(pNavMeshItem.has("phantom"));
- //llassert(pNavMeshItem.get("phantom").isBoolean()); XXX stinson 01/10/2012: this should be a boolean but is not
+ llassert(pNavMeshItem.get("phantom").isBoolean());
mIsPhantom = pNavMeshItem.get("phantom").asBoolean();
llassert(pNavMeshItem.has("A"));
@@ -865,21 +865,6 @@ 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("ObjectNavMeshProperties");
- if (navMeshDataURL.empty())
- {
- navMeshDataURL = region->getCapability("ObjectNavmesh");
- }
- }
-
- return navMeshDataURL;
-#else // XXX_STINSON_REGION_CAP_RENAME
std::string navMeshDataURL("");
LLViewerRegion* region = gAgent.getRegion();
@@ -889,7 +874,6 @@ std::string LLFloaterPathfindingLinksets::getCapabilityURL() const }
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 978580498e..800e394b16 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1522,9 +1522,6 @@ 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"); 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 |