livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge -r 66456:66594 Branch_1-18-1 -> release 

Includes voice-server-changes (0:66493)
master
Steven Bennetts 2007-07-27 21:54:03 +00:00
parent ef32d1d6b0
commit e27e86e033
3 changed files with 50 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
etc/message.xml
View File

@ -300,14 +300,6 @@
<boolean>true</boolean>
</map>
<key>ChatterBoxSessionLeaveReply</key>
<map>
<key>flavor</key>
<string>llsd</string>
<key>trusted-sender</key>
<boolean>true</boolean>
</map>
<key>ChatterBoxSessionAgentListUpdates</key>
<map>
<key>flavor</key>
@ -323,33 +315,67 @@
<key>trusted-sender</key>
<boolean>true</boolean>
</map>
<!-- 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>

4
indra/newview/English.lproj/InfoPlist.strings
View File

@ -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.";

2
indra/newview/Info-SecondLife.plist
View File

@ -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>