From e27e86e0334dc847687a557d0891c6ca91bb7de9 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Fri, 27 Jul 2007 21:54:03 +0000
Subject: merge -r 66456:66594 Branch_1-18-1 -> release Includes
 voice-server-changes (0:66493)

---
 etc/message.xml                               | 49 +++++++++++++++++++++++----
 indra/newview/English.lproj/InfoPlist.strings |  4 +--
 indra/newview/Info-SecondLife.plist           |  2 +-
 3 files changed, 45 insertions(+), 10 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>
diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings
index bc1c7dd62a..5991f9150f 100644
--- a/indra/newview/English.lproj/InfoPlist.strings
+++ b/indra/newview/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Second Life";
-CFBundleShortVersionString = "Second Life version 1.18.0.6";
-CFBundleGetInfoString = "Second Life version 1.18.0.6, Copyright 2004-2007 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.18.1.1";
+CFBundleGetInfoString = "Second Life version 1.18.1.1, Copyright 2004-2007 Linden Research, Inc.";
diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
index f4dd8e0a99..9bef82e0bc 100644
--- a/indra/newview/Info-SecondLife.plist
+++ b/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.18.0.6</string>
+	<string>1.18.1.1</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 </dict>
-- 
cgit v1.2.3