diff options
| -rw-r--r-- | BuildParams | 23 | ||||
| -rw-r--r-- | indra/newview/English.lproj/InfoPlist.strings | 4 | ||||
| -rw-r--r-- | indra/newview/Info-SecondLife.plist | 2 | ||||
| -rw-r--r-- | indra/newview/installers/windows/installer_template.nsi | 2 | ||||
| -rw-r--r-- | indra/newview/res/viewerRes.rc | 10 |
5 files changed, 11 insertions, 30 deletions
diff --git a/BuildParams b/BuildParams index 3d2fd0810a..900bbc0510 100644 --- a/BuildParams +++ b/BuildParams @@ -156,33 +156,14 @@ viewer-development.build_server_tests = false viewer-development.build_Linux = true viewer-development.build_hg_bundle = true viewer-development.build_docs = true -# viewer-development.viewer_channel = "Second Life Beta Viewer" -# viewer-development.login_channel = "Second Life Beta Viewer" +viewer-development.viewer_channel = "Second Life Development" +viewer-development.login_channel = "Second Life Beta Development" viewer-development.viewer_grid = agni viewer-development.build_viewer_update_version_manager = false # Notifications viewer-development.email = oz@lindenlab.com -# ======================================== -# Viewer Development Test -# ======================================== - -# Report changes since... -viewer-development-test.show_changes_since = 2-1-release - -# Build Settings -viewer-development-test.build_viewer = true -viewer-development-test.build_server = false -viewer-development-test.build_server_tests = false -viewer-development-test.build_Linux = true -viewer-development-test.build_hg_bundle = true -viewer-development-test.build_docs = true -# viewer-development-test.viewer_channel = "Second Life Beta Viewer" -# viewer-development-test.login_channel = "Second Life Beta Viewer" -viewer-development-test.viewer_grid = agni -viewer-development-test.build_viewer_update_version_manager = false - # ======================================= # brad # ======================================== diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings index fc531f93d4..4bf67b1367 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.1.0.0"; -CFBundleGetInfoString = "Second Life version 2.1.0.0, Copyright 2004-2009 Linden Research, Inc."; +CFBundleShortVersionString = "Second Life version 2.1.1.0"; +CFBundleGetInfoString = "Second Life version 2.1.1.0, Copyright 2004-2010 Linden Research, Inc."; diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist index 9bc95f9b95..3cda7467dd 100644 --- a/indra/newview/Info-SecondLife.plist +++ b/indra/newview/Info-SecondLife.plist @@ -60,7 +60,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>2.1.0.0</string> + <string>2.1.1.0</string> <key>CSResourcesFileMapped</key> <true/> </dict> diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index b7b4c54001..3ea7897501 100644 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -1,6 +1,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; secondlife setup.nsi -;; Copyright 2004-2008, Linden Research, Inc. +;; Copyright 2004-2010, Linden Research, Inc. ;; ;; NSIS Unicode 2.38.1 or higher required ;; http://www.scratchpaper.com/ diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc index df2fb2a6ea..a575aabbca 100644 --- a/indra/newview/res/viewerRes.rc +++ b/indra/newview/res/viewerRes.rc @@ -129,8 +129,8 @@ TOOLSIT CURSOR "toolsit.cur" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,1,0,0 - PRODUCTVERSION 2,1,0,0 + FILEVERSION 2,1,1,0 + PRODUCTVERSION 2,1,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -147,12 +147,12 @@ BEGIN BEGIN VALUE "CompanyName", "Linden Lab" VALUE "FileDescription", "Second Life" - VALUE "FileVersion", "2.1.0.0" + VALUE "FileVersion", "2.1.1.0" VALUE "InternalName", "Second Life" - VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc." + VALUE "LegalCopyright", "Copyright © 2001-2010, Linden Research, Inc." VALUE "OriginalFilename", "SecondLife.exe" VALUE "ProductName", "Second Life" - VALUE "ProductVersion", "2.1.0.0" + VALUE "ProductVersion", "2.1.1.0" END END BLOCK "VarFileInfo" |