diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2012-09-08 18:56:43 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2012-09-08 18:56:43 -0400 |
| commit | 4091e47cf206a41cac7ee440b8fd2e2898006685 (patch) | |
| tree | 61de24d7aa90171a5fb6481189567fe408d03786 /indra/newview/llviewerregion.cpp | |
| parent | 81b9e29a1fe227c8f51c6a644b4e2e1afa6bcfb2 (diff) | |
| parent | 09cd2a4b1a9f1ddf046fb0ce5d12988b968269a3 (diff) | |
DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.
cmake and other files didn't get moved over, do it by hand.
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 05c7ef5381..effa368b7a 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1553,7 +1553,6 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames) capabilityNames.append("NewFileAgentInventory"); capabilityNames.append("ObjectNavMeshProperties"); capabilityNames.append("ParcelPropertiesUpdate"); - capabilityNames.append("ParcelMediaURLFilterList"); capabilityNames.append("ParcelNavigateMedia"); capabilityNames.append("ParcelVoiceInfoRequest"); capabilityNames.append("ProductInfoRequest"); |