diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-18 12:50:15 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-18 12:50:15 -0400 |
| commit | d36f74ba331670de24031e23a5d15378f410c6af (patch) | |
| tree | b5b5b1cc80e0952adbb1d22505ab8995e91c5998 /indra/newview/llviewerregion.cpp | |
| parent | a519e34f02b4b2663fe082ba9ad12f1b423669cb (diff) | |
| parent | 9b2daf4b19fca22bd74aefab49ef41eb8e06c651 (diff) | |
merge changes for storm-1843
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index e3cb985ddb..a43a6c6d7d 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1522,7 +1522,6 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames) capabilityNames.append("MeshUploadFlag"); capabilityNames.append("NewFileAgentInventory"); capabilityNames.append("ParcelPropertiesUpdate"); - capabilityNames.append("ParcelMediaURLFilterList"); capabilityNames.append("ParcelNavigateMedia"); capabilityNames.append("ParcelVoiceInfoRequest"); capabilityNames.append("ProductInfoRequest"); |