svn -c 94141 merge svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer-merge-1

indra/llcommon/llversionserver.h

@@ -35,7 +35,7 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 24;
 const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 93453;
+const S32 LL_VERSION_BUILD = 94081;
 
 const char * const LL_CHANNEL = "Second Life Server";
 

indra/llcommon/llversionviewer.h

@@ -35,7 +35,7 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 21;
 const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 0;
+const S32 LL_VERSION_BUILD = 94081;
 
 const char * const LL_CHANNEL = "Second Life Release";
 

indra/newview/English.lproj/InfoPlist.strings

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

indra/newview/Info-SecondLife.plist

@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.20.9.87416</string>
+	<string>1.20.15.94081</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,9,87416
- PRODUCTVERSION 1,20,9,87416
+ FILEVERSION 1,20,15,94081
+ PRODUCTVERSION 1,20,15,94081
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -249,12 +249,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Linden Lab"
             VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "1.20.9.87416"
+            VALUE "FileVersion", "1.20.15.94081"
             VALUE "InternalName", "Second Life"
             VALUE "LegalCopyright", "Copyright  2001-2008, Linden Research, Inc."
             VALUE "OriginalFilename", "SecondLife.exe"
             VALUE "ProductName", "Second Life"
-            VALUE "ProductVersion", "1.20.9.87416"
+            VALUE "ProductVersion", "1.20.15.94081"
         END
     END
     BLOCK "VarFileInfo"