diff options
| author | prep <none@none> | 2012-03-21 09:53:59 -0400 |
|---|---|---|
| committer | prep <none@none> | 2012-03-21 09:53:59 -0400 |
| commit | e94a38f0c99fbbf315c4fba1ce32edbe5f4bf7ed (patch) | |
| tree | 8a547595fcd69d8cfab20bd091922d06536c16d3 /indra/newview/llviewerregion.cpp | |
| parent | 154e569923d0caf99fb0d24af8475731f5ceaf33 (diff) | |
| parent | bb0f2d3784e3b14e673c893e95072bca5c54848c (diff) | |
merge
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. } |