diff options
author | McCabe Maxsted | 2010-11-02 21:32:04 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-11-02 21:32:04 -0700 |
commit | b5074f1a8e3306f1be9e93172d26c97ff088cea0 (patch) | |
tree | a53d5cc54a1f339b7637a9d7d8248eca42995af2 /linden/etc | |
parent | Revert "Fix Bug #671 (aka VWR-1603): Duckwalk is too fast" (diff) | |
parent | Uploaded the linux64 libraries created by Aleric to imprudenceviewer.org (diff) | |
download | meta-impy-b5074f1a8e3306f1be9e93172d26c97ff088cea0.zip meta-impy-b5074f1a8e3306f1be9e93172d26c97ff088cea0.tar.gz meta-impy-b5074f1a8e3306f1be9e93172d26c97ff088cea0.tar.bz2 meta-impy-b5074f1a8e3306f1be9e93172d26c97ff088cea0.tar.xz |
Merged webkit_plugins into weekly. Huzzah! The weekly branch now has browser/media plugin support
Diffstat (limited to 'linden/etc')
-rw-r--r-- | linden/etc/message.xml | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/linden/etc/message.xml b/linden/etc/message.xml index c53e846..0fdf364 100644 --- a/linden/etc/message.xml +++ b/linden/etc/message.xml | |||
@@ -393,7 +393,23 @@ | |||
393 | <key>trusted-sender</key> | 393 | <key>trusted-sender</key> |
394 | <boolean>true</boolean> | 394 | <boolean>true</boolean> |
395 | </map> | 395 | </map> |
396 | |||
397 | <key>ParcelMediaURLFilter</key> | ||
398 | <map> | ||
399 | <key>flavor</key> | ||
400 | <string>llsd</string> | ||
401 | <key>trusted-sender</key> | ||
402 | <boolean>false</boolean> | ||
403 | </map> | ||
396 | 404 | ||
405 | <key>ParcelNavigateMedia</key> | ||
406 | <map> | ||
407 | <key>flavor</key> | ||
408 | <string>llsd</string> | ||
409 | <key>trusted-sender</key> | ||
410 | <boolean>false</boolean> | ||
411 | </map> | ||
412 | |||
397 | <key>ParcelObjectOwnersReply</key> | 413 | <key>ParcelObjectOwnersReply</key> |
398 | <map> | 414 | <map> |
399 | <key>flavor</key> | 415 | <key>flavor</key> |