diff --git a/.hgignore b/.hgignore index 6ed2a0c5f71a70dc0f683a12700af8e720f80103..e5737fa733548149f8e7c66b86d93db45d33cb01 100644 --- a/.hgignore +++ b/.hgignore @@ -34,3 +34,5 @@ indra/web/doc/asset-upload/plugins/verify-texture installed.xml libraries tarfile_tmp +^indra/lib/python/eventlet.* +^indra/lib/python/mulib.* diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h index e9e21cffb6950315ffa025a605bc63c2a3f399e6..72247206da9bde7c1595bf5413a075e1f16f2719 100644 --- a/indra/llcommon/llversionserver.h +++ b/indra/llcommon/llversionserver.h @@ -36,7 +36,7 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 29; const S32 LL_VERSION_PATCH = 0; -const S32 LL_VERSION_BUILD = 2425; +const S32 LL_VERSION_BUILD = 2822; const char * const LL_CHANNEL = "Second Life Server"; diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 04cf98ce19c6464a425945fc33d5f9a7544de03c..ca5bcb5a95872774e027573330a5a1b734fd5cc6 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -36,7 +36,7 @@ const S32 LL_VERSION_MAJOR = 2; const S32 LL_VERSION_MINOR = 0; const S32 LL_VERSION_PATCH = 0; -const S32 LL_VERSION_BUILD = 2425; +const S32 LL_VERSION_BUILD = 2822; const char * const LL_CHANNEL = "Second Life 2009"; diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings index 28853ba032ecf9c6080571f3c3b989acf6aa7753..afa5a877b5b96d2a70cf5925803c0271051c9a65 100644 --- a/indra/newview/English.lproj/InfoPlist.strings +++ b/indra/newview/English.lproj/InfoPlist.strings @@ -2,6 +2,6 @@ CFBundleName = "Second Life"; -CFBundleShortVersionString = "Second Life version 2.0.0.2425"; -CFBundleGetInfoString = "Second Life version 2.0.0.2425, Copyright 2004-2009 Linden Research, Inc."; +CFBundleShortVersionString = "Second Life version 2.0.0.2822"; +CFBundleGetInfoString = "Second Life version 2.0.0.2822, Copyright 2004-2009 Linden Research, Inc."; diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist index c0a33feaeca0c4c7e887c09cc39d1a4f689702f1..1df5102f5f0506c4763e4d8904f8b0677a707df2 100644 --- a/indra/newview/Info-SecondLife.plist +++ b/indra/newview/Info-SecondLife.plist @@ -32,7 +32,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>2.0.0.2425</string> + <string>2.0.0.2822</string> <key>CSResourcesFileMapped</key> <true/> </dict> diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc index a5ee78df2c48ba7b894ad3245ae7afa4a2e85b0b..6a32dba08315e2c15b6aa022dfa7f148146df472 100644 --- a/indra/newview/res/viewerRes.rc +++ b/indra/newview/res/viewerRes.rc @@ -138,8 +138,8 @@ TOOLMEDIAOPEN CURSOR "toolmediaopen.cur" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,0,0,2425 - PRODUCTVERSION 2,0,0,2425 + FILEVERSION 2,0,0,2822 + PRODUCTVERSION 2,0,0,2822 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -156,12 +156,12 @@ BEGIN BEGIN VALUE "CompanyName", "Linden Lab" VALUE "FileDescription", "Second Life" - VALUE "FileVersion", "2.0.0.2425" + VALUE "FileVersion", "2.0.0.2822" VALUE "InternalName", "Second Life" VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc." VALUE "OriginalFilename", "SecondLife.exe" VALUE "ProductName", "Second Life" - VALUE "ProductVersion", "2.0.0.2425" + VALUE "ProductVersion", "2.0.0.2822" END END BLOCK "VarFileInfo"