summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.cpp
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-01-18 16:55:15 -0800
committerTodd Stinson <stinson@lindenlab.com>2012-01-18 16:55:15 -0800
commitf88a8f6f46d9b4e9e628a910e941787d327adf5d (patch)
tree9b3c87d5ad1ea8d2db3d0dbbe43779e779f4b12e /indra/newview/llviewerregion.cpp
parentfe18dda3df1c5061ac0b956bfebc261c45467738 (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/llviewerregion.cpp')
-rw-r--r--indra/newview/llviewerregion.cpp3
1 files changed, 3 insertions, 0 deletions
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");