summaryrefslogtreecommitdiff
path: root/etc/message.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-01-17 13:54:39 -0500
committerOz Linden <oz@lindenlab.com>2013-01-17 13:54:39 -0500
commit841dc5da2ef9626fa4ab9255681d217df62a6b0b (patch)
tree2c5bacebcb27b78d318b6e162334488f6e515974 /etc/message.xml
parentb7f8a2479249646c7fb38ead195d5197ab733c94 (diff)
parentd16757545c91d4f7dac3c52a311ad0f0239052e1 (diff)
merge up to 3.4.4
Diffstat (limited to 'etc/message.xml')
-rw-r--r--etc/message.xml8
1 files changed, 0 insertions, 8 deletions
diff --git a/etc/message.xml b/etc/message.xml
index 7b133ab205..6d8160abb5 100644
--- a/etc/message.xml
+++ b/etc/message.xml
@@ -385,14 +385,6 @@
<key>trusted-sender</key>
<boolean>true</boolean>
</map>
-
- <key>ParcelMediaURLFilter</key>
- <map>
- <key>flavor</key>
- <string>llsd</string>
- <key>trusted-sender</key>
- <boolean>false</boolean>
- </map>
<key>ParcelNavigateMedia</key>
<map>