summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2007-07-27 21:54:03 +0000
committerSteven Bennetts <steve@lindenlab.com>2007-07-27 21:54:03 +0000
commite27e86e0334dc847687a557d0891c6ca91bb7de9 (patch)
tree390b20944d92798da8a17edef2e6862614bd6678 /etc
parentef32d1d6b03aad55b26c5e1537cdbc47c6b6c0c4 (diff)
merge -r 66456:66594 Branch_1-18-1 -> release
Includes voice-server-changes (0:66493)
Diffstat (limited to 'etc')
-rw-r--r--etc/message.xml49
1 files changed, 42 insertions, 7 deletions
diff --git a/etc/message.xml b/etc/message.xml
index f8e627334f..e0746acbbd 100644
--- a/etc/message.xml
+++ b/etc/message.xml
@@ -300,7 +300,7 @@
<boolean>true</boolean>
</map>
- <key>ChatterBoxSessionLeaveReply</key>
+ <key>ChatterBoxSessionAgentListUpdates</key>
<map>
<key>flavor</key>
<string>llsd</string>
@@ -308,7 +308,7 @@
<boolean>true</boolean>
</map>
- <key>ChatterBoxSessionAgentListUpdates</key>
+ <key>ChatterBoxInvitation</key>
<map>
<key>flavor</key>
<string>llsd</string>
@@ -316,40 +316,66 @@
<boolean>true</boolean>
</map>
- <key>ChatterBoxInvitation</key>
+ <!-- Client to server -->
+ <key>ParcelVoiceInfoRequest</key>
+ <map>
+ <key>flavor</key>
+ <string>llsd</string>
+ <key>trusted-sender</key>
+ <boolean>false</boolean>
+ </map>
+
+ <!-- Server to client -->
+ <key>ParcelVoiceInfo</key>
<map>
<key>flavor</key>
<string>llsd</string>
<key>trusted-sender</key>
<boolean>true</boolean>
</map>
+
+ <key>ProvisionVoiceAccountRequest</key>
+ <map>
+ <key>flavor</key>
+ <string>llsd</string>
+ <key>trusted-sender</key>
+ <boolean>false</boolean>
+ </map>
+
<key>avatarnotesrequest</key>
<map>
- <key>service_name</key><string>avatar-notes</string>
+ <key>service_name</key>
+ <string>avatar-notes</string>
<key>builder</key>
<string>template</string>
<key>trusted-sender</key>
<boolean>false</boolean>
</map>
+
<key>avatarclassifiedsrequest</key>
<map>
- <key>service_name</key><string>avatar-classifieds</string>
+ <key>service_name</key>
+ <string>avatar-classifieds</string>
<key>builder</key>
<string>template</string>
<key>trusted-sender</key>
<boolean>false</boolean>
</map>
+
<key>avatarpickrequest</key>
<map>
- <key>service_name</key><string>avatar-pick</string>
+ <key>service_name</key>
+ <string>avatar-pick</string>
<key>builder</key>
<string>template</string>
<key>trusted-sender</key>
<boolean>false</boolean>
</map>
+
<key>pickinforequest</key>
<map>
- <key>service_name</key><string>pick-info</string>
+ <key>service_name</key>
+ <string>pick-info</string>
<key>builder</key>
<string>template</string>
<key>trusted-sender</key>
@@ -414,6 +440,15 @@
<key>SendPostcard3</key>
<boolean>true</boolean>
+
+ <key>ParcelVoiceInfoRequest</key>
+ <boolean>false</boolean>
+
+ <key>ChatSessionRequest</key>
+ <boolean>false</boolean>
+
+ <key>ProvisionVoiceAccountRequest</key>
+ <boolean>false</boolean>
</map>
<key>messageBans</key>