summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2012-09-03 20:12:47 +0000
committerDon Kjer <don@lindenlab.com>2012-09-03 20:12:47 +0000
commit403d1b6404355fa26b0bfeff206f5c56758a491c (patch)
tree6438eb8fa29dc8946d404ac79f89cf1bd140bbe1 /etc
parent21c364c4d455cc05ec176032e8c090be0cc4ed50 (diff)
parent825cc7873251ad90720ab40221d689abed7b2ac8 (diff)
Merge VirLinden/sunshine -> don_linden/sunshine-experimental
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 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>