diff options
| author | prep <prep@lindenlab.com> | 2012-01-19 14:39:06 -0500 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2012-01-19 14:39:06 -0500 |
| commit | dc6b871db8e5e5247d8ef88150efb18186b5e6c8 (patch) | |
| tree | 65a14a4731b74a8c22c11142b46ecb1a48a448b5 /indra/newview/llviewerregion.cpp | |
| parent | e2ef5a5edce6a01724d91fde5b471b0bae18d045 (diff) | |
| parent | 146f0c25504cc16458cb20312eba63b04d26389d (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 3 |
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"); |