summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-10-20 12:18:33 -0400
committerLoren Shih <seraph@lindenlab.com>2010-10-20 12:18:33 -0400
commit76876538715e3afbe456e2bf84173bde416d50e6 (patch)
tree423b27e9a5ef5c463b066b0fb5a50bda25060869 /etc
parent0682e10532e058462d2bb1d5379c55d0e4d757e9 (diff)
parent04425000ae60b1fccf4feac1d4d84796d3b6b27d (diff)
Automated merge up from viewer-development
Diffstat (limited to 'etc')
-rw-r--r--etc/message.xml16
1 files changed, 16 insertions, 0 deletions
diff --git a/etc/message.xml b/etc/message.xml
index 86d374ce14..d14606e0c6 100644
--- a/etc/message.xml
+++ b/etc/message.xml
@@ -370,6 +370,14 @@
</map>
<!-- Server to client -->
+ <key>DisplayNameUpdate</key>
+ <map>
+ <key>flavor</key>
+ <string>llsd</string>
+ <key>trusted-sender</key>
+ <boolean>true</boolean>
+ </map>
+
<key>ParcelVoiceInfo</key>
<map>
<key>flavor</key>
@@ -426,6 +434,14 @@
<boolean>true</boolean>
</map>
+ <key>SetDisplayNameReply</key>
+ <map>
+ <key>flavor</key>
+ <string>llsd</string>
+ <key>trusted-sender</key>
+ <boolean>true</boolean>
+ </map>
+
<key>DirLandReply</key>
<map>
<key>flavor</key>