From cf9239cabcf7999a2d2393bd4bdb6fc08e27c09c Mon Sep 17 00:00:00 2001
From: Monroe Williams <monroe@lindenlab.com>
Date: Thu, 1 Oct 2009 02:35:53 +0000
Subject: svn merge -r 134922:134973
 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7

Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.
---
 etc/message.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'etc')

diff --git a/etc/message.xml b/etc/message.xml
index dd1fda059e..d2ba9843e4 100644
--- a/etc/message.xml
+++ b/etc/message.xml
@@ -668,7 +668,14 @@
 		
 			<key>FetchLib</key>
 			<boolean>true</boolean>
-		</map>
+
+            <key>ObjectMedia</key>
+            <boolean>false</boolean>
+                  
+            <key>ObjectMediaNavigate</key>
+            <boolean>false</boolean>
+                  
+      </map>
 
 		<key>messageBans</key>
 		<map>
-- 
cgit v1.2.3