merge -r104755:104769 /linden/branches/deploy-refactor-6 --> trunk

indra/newview/English.lproj/InfoPlist.strings

 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Second Life";
-CFBundleShortVersionString = "Second Life version 1.20.15.97417";
-CFBundleGetInfoString = "Second Life version 1.20.15.97417, Copyright 2004-2008 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.21.6.100000";
+CFBundleGetInfoString = "Second Life version 1.21.6.100000, Copyright 2004-2008 Linden Research, Inc.";
 

indra/newview/Info-SecondLife.plist

@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.20.15.97417</string>
+	<string>1.21.6.100000</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 </dict>

indra/newview/res/viewerRes.rc

@@ -231,8 +231,8 @@ TOOLMEDIAOPEN           CURSOR                  "toolmediaopen.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,20,15,97417
- PRODUCTVERSION 1,20,15,97417
+ FILEVERSION 1,21,6,100000
+ PRODUCTVERSION 1,21,6,100000
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -249,12 +249,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Linden Lab"
             VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "1.20.15.97417"
+            VALUE "FileVersion", "1.21.6.100000"
             VALUE "InternalName", "Second Life"
             VALUE "LegalCopyright", "Copyright  2001-2008, Linden Research, Inc."
             VALUE "OriginalFilename", "SecondLife.exe"
             VALUE "ProductName", "Second Life"
-            VALUE "ProductVersion", "1.20.15.97417"
+            VALUE "ProductVersion", "1.21.6.100000"
         END
     END
     BLOCK "VarFileInfo"