diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2012-09-07 14:47:24 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2012-09-07 14:47:24 -0400 |
commit | 695c4135ff6fa0c50daa4c84f23096096ffd8a54 (patch) | |
tree | a9b539e3ba588634fc493f2ed5ead21124e306ff /etc | |
parent | af6e665d5c9c9a5ea480389c284839f3945bf786 (diff) | |
parent | b6f0921099b9b2a0a582886ebd6383fa20eac2b0 (diff) |
Automated merge with file:///Users/nat/linden/davep-viewer-development-rebased
Diffstat (limited to 'etc')
-rw-r--r-- | etc/message.xml | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/etc/message.xml b/etc/message.xml index 3445975545..6d8160abb5 100644 --- a/etc/message.xml +++ b/etc/message.xml @@ -385,14 +385,6 @@ <key>trusted-sender</key> <boolean>true</boolean> </map> - - <key>ParcelMediaURLFilter</key> - <map> - <key>flavor</key> - <string>llsd</string> - <key>trusted-sender</key> - <boolean>false</boolean> - </map> <key>ParcelNavigateMedia</key> <map> @@ -546,8 +538,24 @@ <key>trusted-sender</key> <boolean>true</boolean> </map> - - <!-- UDPDeprecated Messages --> + + <key>NavMeshStatusUpdate</key> + <map> + <key>flavor</key> + <string>llsd</string> + <key>trusted-sender</key> + <boolean>true</boolean> + </map> + + <key>AgentStateUpdate</key> + <map> + <key>flavor</key> + <string>llsd</string> + <key>trusted-sender</key> + <boolean>true</boolean> + </map> + + <!-- UDPDeprecated Messages --> <key>ScriptRunningReply</key> <map> <key>flavor</key> |