From 7138fb673ac3df46b9cb5f23d0d74e70fdd2b6b3 Mon Sep 17 00:00:00 2001
From: Monroe Williams <monroe@lindenlab.com>
Date: Thu, 2 Aug 2007 01:18:34 +0000
Subject: 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
---
 etc/message.xml | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

(limited to 'etc')

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>
-- 
cgit v1.2.3