diff options
| author | Monroe Williams <monroe@lindenlab.com> | 2007-08-02 01:18:34 +0000 |
|---|---|---|
| committer | Monroe Williams <monroe@lindenlab.com> | 2007-08-02 01:18:34 +0000 |
| commit | 7138fb673ac3df46b9cb5f23d0d74e70fdd2b6b3 (patch) | |
| tree | 3c34a3a180b5275bd4166b0056765c5868f56447 /etc | |
| parent | f6a10b3214d79df4e8f5768acaa68edbd2de5620 (diff) | |
Merge down from Branch_1-18-1:
svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/message.xml | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/etc/message.xml b/etc/message.xml index e0746acbbd..304ba320b1 100644 --- a/etc/message.xml +++ b/etc/message.xml @@ -334,14 +334,6 @@ <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> @@ -381,6 +373,25 @@ <key>trusted-sender</key> <boolean>false</boolean> </map> + + <key>ProvisionVoiceAccountRequest</key> + <map> + <key>flavor</key> + <string>llsd</string> + <key>trusted-sender</key> + <boolean>false</boolean> + </map> + + <!-- Server to client --> + <key>RequiredVoiceVersion</key> + <map> + <key>flavor</key> + <string>llsd</string> + <key>trusted-sender</key> + <boolean>true</boolean> + </map> + + </map> <key>capBans</key> <map> |