summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorMonroe Williams <monroe@lindenlab.com>2009-08-27 19:00:18 +0000
committerMonroe Williams <monroe@lindenlab.com>2009-08-27 19:00:18 +0000
commit745845f79987e4b4ab7f5728746a0eda8898930f (patch)
treef10efd4a638a6a7eda92a960cdb97e5256ff736a /etc
parent71344b233d5ae3d5262a492b636af04544952611 (diff)
svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05 Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
Diffstat (limited to 'etc')
-rw-r--r--etc/message.xml16
1 files changed, 16 insertions, 0 deletions
diff --git a/etc/message.xml b/etc/message.xml
index 4af5bd5296..dd1fda059e 100644
--- a/etc/message.xml
+++ b/etc/message.xml
@@ -377,7 +377,23 @@
<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>
+ <key>flavor</key>
+ <string>llsd</string>
+ <key>trusted-sender</key>
+ <boolean>false</boolean>
+ </map>
+
<key>ParcelObjectOwnersReply</key>
<map>
<key>flavor</key>