From 24b26d71ee01211aa796b8061b66ec06a133e4ce Mon Sep 17 00:00:00 2001
From: Dave Simmons <simon@lindenlab.com>
Date: Fri, 20 Mar 2009 20:00:47 +0000
Subject: svn merge -r113004:115000
 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 Merge
 latest 1.26 into trunk

---
 etc/message.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'etc')

diff --git a/etc/message.xml b/etc/message.xml
index 406235ff73..ddfd3e982e 100644
--- a/etc/message.xml
+++ b/etc/message.xml
@@ -474,8 +474,16 @@
 					<key>trusted-sender</key>
 					<boolean>true</boolean>
 				</map>
-				
-				<key>CrossedRegion</key>
+
+        <key>TeleportFailed</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>
@@ -524,14 +532,6 @@
 					<boolean>false</boolean>
 				</map>
 
-				<key>EstateOwnerMessage</key>
-				<map>
-					<key>flavor</key>
-					<string>llsd</string>
-					<key>trusted-sender</key>
-					<boolean>false</boolean>
-				</map>
-
 				<key>RpcScriptRequestInboundForward</key>
 				<map>
 					<key>flavor</key>
-- 
cgit v1.2.3