From 6078836153e570e595a80e2e0fc869c94dff3575 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 9 Jan 2016 19:26:00 +0100 Subject: [PATCH] Welcome, 2016! --- FIRESTORM-SOURCE_LICENSE_HEADER.txt | 4 ++-- autobuild.xml | 2 +- indra/newview/CMakeLists.txt | 2 +- indra/newview/English.lproj/InfoPlist.strings | 2 +- indra/newview/installers/windows_x64/installer.wxs | 2 +- indra/newview/res/viewerRes.rc | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/FIRESTORM-SOURCE_LICENSE_HEADER.txt b/FIRESTORM-SOURCE_LICENSE_HEADER.txt index 5d8fad58fc..d42a5f44f3 100644 --- a/FIRESTORM-SOURCE_LICENSE_HEADER.txt +++ b/FIRESTORM-SOURCE_LICENSE_HEADER.txt @@ -2,9 +2,9 @@ * @file * @brief * - * $LicenseInfo:firstyear=2015&license=fsviewerlgpl$ + * $LicenseInfo:firstyear=2016&license=fsviewerlgpl$ * Phoenix Firestorm Viewer Source Code - * Copyright (C) 2015, The Phoenix Firestorm Project, Inc. + * Copyright (C) 2016, The Phoenix Firestorm Project, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/autobuild.xml b/autobuild.xml index 0ac237681f..31a145b58f 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -2449,7 +2449,7 @@ package_description copyright - Copyright (c) 2014, Linden Research, Inc. + Copyright (c) 2016, The Phoenix Firestorm Project, Inc. description Firestorm Viewer license diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 86ff9cc55a..7d79045aef 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2434,7 +2434,7 @@ if (DARWIN) set(MACOSX_BUNDLE_BUNDLE_NAME "Firestorm") set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${VIEWER_SHORT_VERSION}") set(MACOSX_BUNDLE_BUNDLE_VERSION "${VIEWER_SHORT_VERSION}${VIEWER_MACOSX_PHASE}${VIEWER_REVISION}") - set(MACOSX_BUNDLE_COPYRIGHT "Copyright 2010-2014 The Phoenix Firestorm Project, Inc.") + set(MACOSX_BUNDLE_COPYRIGHT "Copyright 2010-2016 The Phoenix Firestorm Project, Inc.") set(MACOSX_BUNDLE_NSMAIN_NIB_FILE "Firestorm.nib") set(MACOSX_BUNDLE_NSPRINCIPAL_CLASS "LLNSApplication") diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings index 186c308837..3cf2f2865e 100644 --- a/indra/newview/English.lproj/InfoPlist.strings +++ b/indra/newview/English.lproj/InfoPlist.strings @@ -3,4 +3,4 @@ CFBundleName = "Firestorm"; CFBundleShortVersionString = "Firestorm version %%VERSION%%"; -CFBundleGetInfoString = "Firestorm version %%VERSION%%, Copyright 2010-2014 The Phoenix Firestorm Project, Inc."; +CFBundleGetInfoString = "Firestorm version %%VERSION%%, Copyright 2010-2016 The Phoenix Firestorm Project, Inc."; diff --git a/indra/newview/installers/windows_x64/installer.wxs b/indra/newview/installers/windows_x64/installer.wxs index b63cd571d1..394c167e8b 100644 --- a/indra/newview/installers/windows_x64/installer.wxs +++ b/indra/newview/installers/windows_x64/installer.wxs @@ -7,7 +7,7 @@ UpgradeCode="$(var.UPGRADECODE)" HelpUrl="http://www.firestormviewer.org/support" AboutUrl="http://www.firestormviewer.org" - Copyright="Copyright© 2015, The Phoenix Firestorm Project, Inc." + Copyright="Copyright© 2016, The Phoenix Firestorm Project, Inc." Condition="(VersionNT = v6.0 AND ServicePackLevel = 2) OR (VersionNT >= v6.1)" IconSourceFile="$(var.WIX_SOURCEDIR)\..\windows\firestorm_icon.ico" > diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc index e758163c33..49b84eac20 100755 --- a/indra/newview/res/viewerRes.rc +++ b/indra/newview/res/viewerRes.rc @@ -159,10 +159,10 @@ BEGIN VALUE "CompanyName", "The Phoenix Firestorm Project, Inc." VALUE "FileDescription", "Firestorm" VALUE "FileVersion", "${VIEWER_VERSION_MAJOR}.${VIEWER_VERSION_MINOR}.${VIEWER_VERSION_PATCH}.${VIEWER_VERSION_REVISION}" - VALUE "InternalName", "Second Life" - VALUE "LegalCopyright", "Copyright \251 2010-2014, The Phoenix Firestorm Project, Inc." + VALUE "InternalName", "Firestorm" + VALUE "LegalCopyright", "Copyright \251 2010-2016, The Phoenix Firestorm Project, Inc." VALUE "OriginalFilename", "Firestorm.exe" - VALUE "ProductName", "Second Life" + VALUE "ProductName", "Firestorm" VALUE "ProductVersion", "${VIEWER_VERSION_MAJOR}.${VIEWER_VERSION_MINOR}.${VIEWER_VERSION_PATCH}.${VIEWER_VERSION_REVISION}" END END