From b069bb9e71d31495f3f1312529d19fdb83c1779e Mon Sep 17 00:00:00 2001
From: Christian Goetze <cg@lindenlab.com>
Date: Wed, 1 Oct 2008 00:42:47 +0000
Subject: svn merge -r96886:98039
 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server -->
 release

---
 etc/message.xml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'etc')

diff --git a/etc/message.xml b/etc/message.xml
index 0695d0580d..d833074765 100644
--- a/etc/message.xml
+++ b/etc/message.xml
@@ -441,6 +441,30 @@
 					<boolean>true</boolean>
 				</map>
 				
+				<key>EnableSimulator</key>
+				<map>
+					<key>flavor</key>
+					<string>llsd</string>
+					<key>trusted-sender</key>
+					<boolean>true</boolean>
+				</map>
+				
+				<key>TeleportFinish</key>
+				<map>
+					<key>flavor</key>
+					<string>llsd</string>
+					<key>trusted-sender</key>
+					<boolean>true</boolean>
+				</map>
+				
+				<key>CrossedRegion</key>
+				<map>
+					<key>flavor</key>
+					<string>llsd</string>
+					<key>trusted-sender</key>
+					<boolean>true</boolean>
+				</map>
+				
 				<!-- UDPDeprecated Messages -->
 				<key>ScriptRunningReply</key>
 				<map>
-- 
cgit v1.2.3