diff options
| author | Dave Simmons <simon@lindenlab.com> | 2009-03-20 20:00:47 +0000 |
|---|---|---|
| committer | Dave Simmons <simon@lindenlab.com> | 2009-03-20 20:00:47 +0000 |
| commit | 24b26d71ee01211aa796b8061b66ec06a133e4ce (patch) | |
| tree | 96bffcd019c933ad3ebbfd5f096968108b22aab5 /etc | |
| parent | 5dfd435872e36445dcc82f99443dfc5a7ee0805a (diff) | |
svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
Merge latest 1.26 into trunk
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/message.xml | 20 |
1 files changed, 10 insertions, 10 deletions
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> |