diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-03-20 17:38:58 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-03-20 17:38:58 -0700 |
| commit | 2f4ad07633264688f5335022f65bfab095c19815 (patch) | |
| tree | 8a4e1a85508544a695459a02bb59c5990d9a3e1a /indra/newview/llviewerregion.cpp | |
| parent | a2fc83de1e3f47accee9387f2710727edc9e27d4 (diff) | |
Cleaning up miscellaneous differences between the pathfinding repository and the latest viewer-development.
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index fc04546bb8..243231c65a 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1523,7 +1523,6 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames) capabilityNames.append("MapLayerGod"); capabilityNames.append("MeshUploadFlag"); capabilityNames.append("NavMeshGenerationStatus"); - capabilityNames.append("NavMeshUpload"); capabilityNames.append("NewFileAgentInventory"); capabilityNames.append("ObjectNavMeshProperties"); capabilityNames.append("ParcelPropertiesUpdate"); @@ -1562,6 +1561,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames) capabilityNames.append("ViewerMetrics"); capabilityNames.append("ViewerStartAuction"); capabilityNames.append("ViewerStats"); + // Please add new capabilities alphabetically to reduce // merge conflicts. } |