summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-11-12 12:58:28 -0800
committerGilbert Gonzales <gilbert@lindenlab.com>2012-11-12 12:58:28 -0800
commit0e6139eb3d3af1e77df20f87deef427993bf2c61 (patch)
tree2c93f9a8d69f28cec99393b3cacbab85a8aa073d /etc
parent6f53b5baeb9e04c20c8fe6f419e09c9604a56497 (diff)
parent7833ecb58094641d3cd79c6772ad6c9fd4799f92 (diff)
merging in latest changes
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>