summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-06-18 12:50:15 -0400
committerOz Linden <oz@lindenlab.com>2012-06-18 12:50:15 -0400
commitd36f74ba331670de24031e23a5d15378f410c6af (patch)
treeb5b5b1cc80e0952adbb1d22505ab8995e91c5998 /etc
parenta519e34f02b4b2663fe082ba9ad12f1b423669cb (diff)
parent9b2daf4b19fca22bd74aefab49ef41eb8e06c651 (diff)
merge changes for storm-1843
Diffstat (limited to 'etc')
-rw-r--r--etc/message.xml8
1 files changed, 0 insertions, 8 deletions
diff --git a/etc/message.xml b/etc/message.xml
index 3445975545..3b5a4a428e 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>