From b54fd9d6855c8547ce03beacf1ef04eb6396e75e Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Tue, 29 Jun 2010 13:04:31 +0100 Subject: VWR-8885 CMAKE build hard depends on artwork files Warn earlier, clearer and harder about missing artwork bundle - this still bites snowglobe builders regularly. Reviewed by Aimee. --- indra/newview/res/have_artwork_bundle.marker | 1 + 1 file changed, 1 insertion(+) create mode 100644 indra/newview/res/have_artwork_bundle.marker (limited to 'indra/newview/res') diff --git a/indra/newview/res/have_artwork_bundle.marker b/indra/newview/res/have_artwork_bundle.marker new file mode 100644 index 0000000000..1dbb238d53 --- /dev/null +++ b/indra/newview/res/have_artwork_bundle.marker @@ -0,0 +1 @@ +If this file exists then you have the artwork bundle installed, which is packaged separately from the Viewer source in the open-source tree. This marker is for the benefit of the build system so it can warn you properly if it's not there. :) -- cgit v1.2.3 From 6867e1135127eb1f1fac19303161b9ee7039e5cd Mon Sep 17 00:00:00 2001 From: Dessie Linden Date: Wed, 11 Aug 2010 11:14:59 -0700 Subject: Updated viewer patch number & channel --- indra/newview/res/viewerRes.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/res') diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc index df2fb2a6ea..9bafc28705 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,0,13828 + PRODUCTVERSION 2,1,0,13828 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.0.13828" VALUE "InternalName", "Second Life" VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc." VALUE "OriginalFilename", "SecondLife.exe" VALUE "ProductName", "Second Life" - VALUE "ProductVersion", "2.1.0.0" + VALUE "ProductVersion", "2.1.0.13828" END END BLOCK "VarFileInfo" -- cgit v1.2.3