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

Changed viewer channel to "Second Life Development"

master
Aimee Linden 2010-08-14 19:20:37 +01:00
parent 4ee6001c92
commit 3bea7e32d3
5 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
BuildParams
View File

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

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

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

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

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

2
indra/newview/installers/windows/installer_template.nsi
View File

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

10
indra/newview/res/viewerRes.rc
View File

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